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  
    4141#include <QOpenGLContext>
    4242#elif OS(WINDOWS)
    4343#include <windows.h>
     44#elif PLATFORM(X11)
     45#include <GL/glx.h>
    4446#elif OS(MAC_OS_X)
    4547#include <AGL/agl.h>
    46 #elif defined(XP_UNIX)
    47 #include <GL/glx.h>
    4848#endif
    4949
    5050#if USE(CAIRO)
     
    6969        {
    7070            return wglGetCurrentContext();
    7171        }
    72 #elif OS(MAC_OS_X)
    73         typedef AGLContext GLContext;
     72#elif PLATFORM(X11)
     73        typedef GLXContext GLContext;
    7474        static GLContext getCurrentGLContext()
    7575        {
    76             return aglGetCurrentContext();
     76            return glXGetCurrentContext();
    7777        }
    78 #elif defined(XP_UNIX)
    79         typedef GLXContext GLContext;
     78#elif OS(MAC_OS_X)
     79        typedef AGLContext GLContext;
    8080        static GLContext getCurrentGLContext()
    8181        {
    82             return glXGetCurrentContext();
     82            return aglGetCurrentContext();
    8383        }
    8484#else
    8585        // Default implementation for unknown opengl.