Ticket #37190: x11-dont-use-native-opengl.patch
File x11-dont-use-native-opengl.patch, 1.4 KB (added by elelay (Eric Le Lay), 12 years ago) |
---|
-
/opt/local/var/macports/build/_Users_elelay_misc_macports_local_dport_www_webkit-gtk/webkit-gtk/work/webkitgtk-1.10.2/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp
old new 41 41 #include <QOpenGLContext> 42 42 #elif OS(WINDOWS) 43 43 #include <windows.h> 44 #elif PLATFORM(X11) 45 #include <GL/glx.h> 44 46 #elif OS(MAC_OS_X) 45 47 #include <AGL/agl.h> 46 #elif defined(XP_UNIX)47 #include <GL/glx.h>48 48 #endif 49 49 50 50 #if USE(CAIRO) … … 69 69 { 70 70 return wglGetCurrentContext(); 71 71 } 72 #elif OS(MAC_OS_X)73 typedef AGLContext GLContext;72 #elif PLATFORM(X11) 73 typedef GLXContext GLContext; 74 74 static GLContext getCurrentGLContext() 75 75 { 76 return aglGetCurrentContext();76 return glXGetCurrentContext(); 77 77 } 78 #elif defined(XP_UNIX)79 typedef GLXContext GLContext;78 #elif OS(MAC_OS_X) 79 typedef AGLContext GLContext; 80 80 static GLContext getCurrentGLContext() 81 81 { 82 return glXGetCurrentContext();82 return aglGetCurrentContext(); 83 83 } 84 84 #else 85 85 // Default implementation for unknown opengl.