From 2ab88e167e79eb2e92ea54e23866e28d54a4ad6e Mon Sep 17 00:00:00 2001 From: Sonicadvance1 Date: Sat, 13 Sep 2008 05:41:26 +0000 Subject: [PATCH] Some ATI cards have both ATI_draw_buffers AND ARB_draw_buffers, if both, go with ARB_draw_buffers git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@507 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp | 3 ++- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp index b0f0e63c1c..34e2623d88 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLInit.cpp @@ -91,6 +91,7 @@ BOOL Callback_PeekMessages() #else // GLX // This is called from Outside of our video thread, from EmuThread // The calls are NOT thread safe, so it breaks everything + return FALSE; #endif } @@ -379,7 +380,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight /* create a fullscreen window */ GLWin.attr.override_redirect = True; - GLWin.attr.event_mask = ExposureMask | StructureNotifyMask | ResizeRedirectMask; + GLWin.attr.event_mask = ExposureMask | StructureNotifyMask; GLWin.win = XCreateWindow(GLWin.dpy, RootWindow(GLWin.dpy, vi->screen), 0, 0, dpyWidth, dpyHeight, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel | CWColormap | CWEventMask | CWOverrideRedirect, diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index fdfd1cb88e..ca2f8feb1c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -86,7 +86,8 @@ bool Renderer::Create2() if( strstr(ptoken, "GL_EXT_blend_logic_op") != NULL ) g_bBlendLogicOp = true; - if( strstr(ptoken, "ATI_draw_buffers") != NULL ) + if( strstr(ptoken, "ATI_draw_buffers") != NULL && strstr(ptoken, "ARB_draw_buffers") == NULL) + //Checks if it ONLY has the ATI_draw_buffers extension, some have both s_bATIDrawBuffers = true; s_bFullscreen = g_Config.bFullscreen;