From 06190a2d9ba2bb59a3d5aefc89d4c341551f881e Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 2 Jan 2014 23:12:03 +0100 Subject: [PATCH] PANDORA: Make GLES context compatible with latest driver (FB only, no X11) --- source/gles2n64/src/eglport.cpp | 10 +++++----- source/mupen64plus-core/src/api/eglport.cpp | 10 +++++----- .../mupen64plus-video-arachnoid/src/renderer/eglport.c | 10 +++++----- source/rice_gles/src/eglport.c | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) 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 ); } } -- 2.39.5