diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2009-06-15 13:47:44 (GMT) |
|---|---|---|
| committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2009-06-15 13:49:44 (GMT) |
| commit | 897e4a90fe17dd64a13aff41f64514fdbe8cdcbc (patch) | |
| tree | 18ad585b18fd8770fb53b0727f06f6f5b7653a60 | |
| parent | af090d63ab04ec73c7978ac8e8b3cc312c768c8f (diff) | |
| download | Qt-897e4a90fe17dd64a13aff41f64514fdbe8cdcbc.zip Qt-897e4a90fe17dd64a13aff41f64514fdbe8cdcbc.tar.gz Qt-897e4a90fe17dd64a13aff41f64514fdbe8cdcbc.tar.bz2 | |
Disabled the use of VERSION_1_3 GLX functions on HPUX.
This is a compilation fix reported by pulse agent on HPUXi.
Reviewed-by: Samuel
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index da61634..f241e61 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -522,7 +522,11 @@ void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth) const QX11Info *xinfo = qt_x11Info(d->paintDevice); bool useFBConfig = false; -#if defined(GLX_VERSION_1_3) && !defined(QT_NO_XRENDER) +#if defined(GLX_VERSION_1_3) && !defined(QT_NO_XRENDER) && !defined(Q_OS_HPUX) + /* + HPUX defines GLX_VERSION_1_3 but does not implement the corresponding functions. + Specifically glXChooseFBConfig and glXGetVisualFromFBConfig are not implemented. + */ QWidget* widget = 0; if (d->paintDevice->devType() == QInternal::Widget) widget = static_cast<QWidget*>(d->paintDevice); @@ -565,7 +569,7 @@ void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth) } #endif -#if defined(GLX_VERSION_1_3) +#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) // GLX_RENDER_TYPE is only in glx >=1.3 if (useFBConfig) { spec[i++] = GLX_RENDER_TYPE; @@ -627,7 +631,7 @@ void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth) spec[i++] = f.samples() == -1 ? 4 : f.samples(); } -#if defined(GLX_VERSION_1_3) +#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) if (useFBConfig) { spec[i++] = GLX_DRAWABLE_TYPE; switch(d->paintDevice->devType()) { @@ -652,7 +656,7 @@ void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth) XVisualInfo* chosenVisualInfo = 0; -#if defined(GLX_VERSION_1_3) +#if defined(GLX_VERSION_1_3) && !defined(Q_OS_HPUX) while (useFBConfig) { GLXFBConfig *configs; int configCount = 0; |