From: ptitSeb <sebastien.chev@gmail.com>
Date: Thu, 2 Jan 2014 22:12:03 +0000 (+0100)
Subject: PANDORA: Make GLES context compatible with latest driver (FB only, no X11)
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=mupen64plus-pandora.git;a=commitdiff_plain;h=06190a2d9ba2bb59a3d5aefc89d4c341551f881e

PANDORA: Make GLES context compatible with latest driver (FB only, no X11)
---

diff --git a/source/gles2n64/src/eglport.cpp b/source/gles2n64/src/eglport.cpp
index 9895cc2..2cb5c6e 100755
--- a/source/gles2n64/src/eglport.cpp
+++ b/source/gles2n64/src/eglport.cpp
@@ -333,11 +333,11 @@ void OpenCfg ( const char* file )
     strncpy( eglStrings[CFG_STENCIL_SIZE], "size_stencil=", MAX_STRING );
 
     /* Set defaults */
-#if defined(USE_EGL_SDL)
-    eglSettings[CFG_MODE]           = RENDER_SDL;
-#else
+//#if defined(USE_EGL_SDL)
+//    eglSettings[CFG_MODE]           = RENDER_SDL;
+//#else
     eglSettings[CFG_MODE]           = RENDER_RAW;
-#endif
+//#endif
     eglSettings[CFG_VSYNC]          = 0;
     eglSettings[CFG_FSAA]           = 0;
     eglSettings[CFG_FPS]            = 0;
@@ -371,7 +371,7 @@ void OpenCfg ( const char* file )
     }
     else
     {
-        printf( "EGL ERROR: Unable to read ini settings from file '%s'. Using defaults\n", file );
+        printf( "EGL NOTICE: Unable to read ini settings from file '%s'. Using defaults\n", file );
     }
 }
 
diff --git a/source/mupen64plus-core/src/api/eglport.cpp b/source/mupen64plus-core/src/api/eglport.cpp
index b6c5e2a..c1494ff 100755
--- a/source/mupen64plus-core/src/api/eglport.cpp
+++ b/source/mupen64plus-core/src/api/eglport.cpp
@@ -333,11 +333,11 @@ void OpenCfg ( const char* file )
     strncpy( eglStrings[CFG_STENCIL_SIZE], "size_stencil=", MAX_STRING );
 
     /* Set defaults */
-#if defined(USE_EGL_SDL)
-    eglSettings[CFG_MODE]           = RENDER_SDL;
-#else
+//#if defined(USE_EGL_SDL)
+//    eglSettings[CFG_MODE]           = RENDER_SDL;
+//#else
     eglSettings[CFG_MODE]           = RENDER_RAW;
-#endif
+//#endif
     eglSettings[CFG_VSYNC]          = 0;
     eglSettings[CFG_FSAA]           = 0;
     eglSettings[CFG_FPS]            = 0;
@@ -371,7 +371,7 @@ void OpenCfg ( const char* file )
     }
     else
     {
-        printf( "EGL ERROR: Unable to read ini settings from file '%s'. Using defaults\n", file );
+        printf( "EGL NOTICE: Unable to read ini settings from file '%s'. Using defaults\n", file );
     }
 }
 
diff --git a/source/mupen64plus-video-arachnoid/src/renderer/eglport.c b/source/mupen64plus-video-arachnoid/src/renderer/eglport.c
index 9db7809..2262124 100755
--- a/source/mupen64plus-video-arachnoid/src/renderer/eglport.c
+++ b/source/mupen64plus-video-arachnoid/src/renderer/eglport.c
@@ -333,11 +333,11 @@ void OpenCfg ( const char* file )
     strncpy( eglStrings[CFG_STENCIL_SIZE], "size_stencil=", MAX_STRING );
 
     /* Set defaults */
-#if defined(USE_EGL_SDL)
-    eglSettings[CFG_MODE]           = RENDER_SDL;
-#else
+//#if defined(USE_EGL_SDL)
+//    eglSettings[CFG_MODE]           = RENDER_SDL;
+//#else
     eglSettings[CFG_MODE]           = RENDER_RAW;
-#endif
+//#endif
     eglSettings[CFG_VSYNC]          = 0;
     eglSettings[CFG_FSAA]           = 0;
     eglSettings[CFG_FPS]            = 0;
@@ -371,7 +371,7 @@ void OpenCfg ( const char* file )
     }
     else
     {
-        printf( "EGL ERROR: Unable to read ini settings from file '%s'. Using defaults\n", file );
+        printf( "EGL NOTICE: Unable to read ini settings from file '%s'. Using defaults\n", file );
     }
 }
 
diff --git a/source/rice_gles/src/eglport.c b/source/rice_gles/src/eglport.c
index 9db7809..2262124 100755
--- a/source/rice_gles/src/eglport.c
+++ b/source/rice_gles/src/eglport.c
@@ -333,11 +333,11 @@ void OpenCfg ( const char* file )
     strncpy( eglStrings[CFG_STENCIL_SIZE], "size_stencil=", MAX_STRING );
 
     /* Set defaults */
-#if defined(USE_EGL_SDL)
-    eglSettings[CFG_MODE]           = RENDER_SDL;
-#else
+//#if defined(USE_EGL_SDL)
+//    eglSettings[CFG_MODE]           = RENDER_SDL;
+//#else
     eglSettings[CFG_MODE]           = RENDER_RAW;
-#endif
+//#endif
     eglSettings[CFG_VSYNC]          = 0;
     eglSettings[CFG_FSAA]           = 0;
     eglSettings[CFG_FPS]            = 0;
@@ -371,7 +371,7 @@ void OpenCfg ( const char* file )
     }
     else
     {
-        printf( "EGL ERROR: Unable to read ini settings from file '%s'. Using defaults\n", file );
+        printf( "EGL NOTICE: Unable to read ini settings from file '%s'. Using defaults\n", file );
     }
 }