diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-28 04:09:42 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-28 04:09:42 (GMT) |
| commit | 46eff02e5dc36f26d7f10bbc74e04875a9fb7220 (patch) | |
| tree | 62fa6a268f9cc6f5e83b79fe461a624ec0133aa3 /src | |
| parent | ba57f5a6d4f1475ce612187702f6a3994abb3ba8 (diff) | |
| download | Qt-46eff02e5dc36f26d7f10bbc74e04875a9fb7220.zip Qt-46eff02e5dc36f26d7f10bbc74e04875a9fb7220.tar.gz Qt-46eff02e5dc36f26d7f10bbc74e04875a9fb7220.tar.bz2 | |
Suppress some compiler warnings that occur under OpenGL/ES 2.0
Reviewed-by: trustme
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index b8a5711..119c89d 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -758,6 +758,8 @@ void QGL2PaintEngineEx::beginNativePainting() glMatrixMode(GL_MODELVIEW); glLoadMatrixf(&mv_matrix[0][0]); +#else + Q_UNUSED(ctx); #endif d->lastTexture = GLuint(-1); @@ -1207,7 +1209,9 @@ void QGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const ensureActive(); d->transferMode(ImageDrawingMode); +#ifndef QT_OPENGL_ES_2 QGLContext *ctx = d->ctx; +#endif glActiveTexture(GL_TEXTURE0 + QT_IMAGE_TEXTURE_UNIT); glBindTexture(GL_TEXTURE_2D, textureId); diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 525c877..3a348bc 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -606,6 +606,8 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint & #else // OpenGL/ES 2.0 version of the fbo blit. else if (d_ptr->fbo) { + Q_UNUSED(target); + GLuint texture = d_ptr->fbo->texture(); glDisable(GL_DEPTH_TEST); |