summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <sroedal@trolltech.com>2009-09-25 15:12:42 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-07 02:57:37 (GMT)
commitbfe30dec4a1ba6a924076ea4c035c0c57d62583f (patch)
treee67b8ced0a320f8324414672f9ec63cd808ccd11
parentac8530959c95889c3a1717cacfc935d2038fc741 (diff)
downloadQt-bfe30dec4a1ba6a924076ea4c035c0c57d62583f.zip
Qt-bfe30dec4a1ba6a924076ea4c035c0c57d62583f.tar.gz
Qt-bfe30dec4a1ba6a924076ea4c035c0c57d62583f.tar.bz2
Fixed missing stencil buffer clear when scissor testing is disabled.
(cherry picked from commit e8a3b49d6d42b213fd4fd55837f6180935a8a603)
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 7cd5aa4..242d02d 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1645,7 +1645,9 @@ void QGL2PaintEngineExPrivate::updateDepthScissorTest()
else
glDisable(GL_DEPTH_TEST);
-#ifndef QT_GL_NO_SCISSOR_TEST
+#ifdef QT_GL_NO_SCISSOR_TEST
+ currentScissorBounds = QRect(0, 0, width, height);
+#else
QRect bounds = q->state()->rectangleClip;
if (!q->state()->clipEnabled) {
if (use_system_clip)