diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-09-28 09:36:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 09:54:27 +0200 |
| commit | af83eecd76962881e2a484ce173f13fbd080c7d1 (patch) | |
| tree | 881861fd34f16ef94a1b91021f3eaca0606fd41d /src/platformsupport/glxconvenience | |
| parent | 04d296d64118ba2d647668494872d93cc1ef7ed1 (diff) | |
Fixed qglxconvenience.cpp compile for GLX 1.3.
These defines are new in GLX 1.4, earlier they were ARB extensions.
Task-number: QTBUG-27370
Change-Id: I83828067d106e93a3909de46a4051d492e277ba9
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/platformsupport/glxconvenience')
| -rw-r--r-- | src/platformsupport/glxconvenience/qglxconvenience.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp index ca5c1cb39d..f21215b6fc 100644 --- a/src/platformsupport/glxconvenience/qglxconvenience.cpp +++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp @@ -48,6 +48,8 @@ #include <X11/extensions/Xrender.h> #endif +#include <GL/glxext.h> + enum { XFocusOut = FocusOut, XFocusIn = FocusIn, @@ -240,7 +242,7 @@ QSurfaceFormat qglx_surfaceFormatFromGLXFBConfig(Display *display, GLXFBConfig c glXGetFBConfigAttrib(display, config, GLX_ALPHA_SIZE, &alphaSize); glXGetFBConfigAttrib(display, config, GLX_DEPTH_SIZE, &depthSize); glXGetFBConfigAttrib(display, config, GLX_STENCIL_SIZE, &stencilSize); - glXGetFBConfigAttrib(display, config, GLX_SAMPLES, &sampleBuffers); + glXGetFBConfigAttrib(display, config, GLX_SAMPLES_ARB, &sampleBuffers); glXGetFBConfigAttrib(display, config, GLX_STEREO, &stereo); format.setRedBufferSize(redSize); |