Fixed QGLWidget::renderText() when using the GL 2 paint engine.

QGLWidget::renderText() needs to respect the current depth and scissor
tests that the user has set. Therefore we needs some special casing in
the GL 2 paint engine to handle the custom depth testing. The private
setRenderTextActive() has been added for this purpose.

Reviewed-by: Samuel

1 files changed, 7 insertions, 1 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index 66e7a51..68447bc 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -141,6 +141,8 @@ public:
 
     QPixmapFilter *createPixmapFilter(int type) const;
 
+    void setRenderTextActive(bool);
+
 private:
     Q_DISABLE_COPY(QGL2PaintEngineEx)
 };
@@ -156,7 +158,8 @@ public:
             ctx(0),
             currentBrush(0),
             inverseScale(1),
-            shaderManager(0)
+            shaderManager(0),
+            inRenderText(false)
     { }
 
     ~QGL2PaintEngineExPrivate();
@@ -191,6 +194,8 @@ public:
     inline void useSimpleShader();
     inline QColor premultiplyColor(QColor c, GLfloat opacity);
 
+    float zValueForRenderText() const;
+
     QGL2PaintEngineEx* q;
     QGLDrawable drawable;
     int width, height;
@@ -240,6 +245,7 @@ public:
     GLuint lastTexture;
 
     bool needsSync;
+    bool inRenderText;
 };
 
 QT_END_NAMESPACE