diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-14 08:51:46 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-14 08:51:46 (GMT) |
| commit | 521c5cc3910bffe566e0fb653041f159ecb5b6d5 (patch) | |
| tree | 70b703fa82b7e5f2e07105fb37ff5dc9353e6598 /src/opengl/qpaintengine_opengl.cpp | |
| parent | f15352c51625688ec445c73125a2e25327377d49 (diff) | |
| download | Qt-521c5cc3910bffe566e0fb653041f159ecb5b6d5.zip Qt-521c5cc3910bffe566e0fb653041f159ecb5b6d5.tar.gz Qt-521c5cc3910bffe566e0fb653041f159ecb5b6d5.tar.bz2 | |
Make QtOpenGL compile on OpenGL ES 1.1 again
Diffstat (limited to 'src/opengl/qpaintengine_opengl.cpp')
| -rw-r--r-- | src/opengl/qpaintengine_opengl.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 0f447d3..d28a495 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -2255,11 +2255,12 @@ void QOpenGLPaintEnginePrivate::updateDepthClip() return; } -#ifndef QT_OPENGL_ES - glClearDepth(0.0f); -#else +#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_ES_1_CL) glClearDepthf(0.0f); +#else + glClearDepth(0.0f); #endif + glEnable(GL_DEPTH_TEST); glDepthMask(GL_TRUE); glClear(GL_DEPTH_BUFFER_BIT); @@ -5580,9 +5581,11 @@ void QOpenGLPaintEnginePrivate::ensureDrawableTexture() QPixmapFilter *QOpenGLPaintEngine::createPixmapFilter(int type) const { +#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL) if (QGLContext::currentContext()) return QGLContext::currentContext()->d_func()->createPixmapFilter(type); else +#endif return 0; } |