diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-29 21:00:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-04 15:10:57 +0200 |
| commit | c5dd6dff08ef9ecd39e446b2c1ded3c55af321fd (patch) | |
| tree | 3f8521de4199a4744f89f749c26420007da0c6be /src | |
| parent | 1b6c8eac6743c7e05031070c61a40141047cc981 (diff) | |
move depth logic out of QSGRenderer
Change-Id: I1fc3baf858664ea9648922204fa0e4d5ca64d740
Reviewed-on: http://codereview.qt-project.org/5848
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/scenegraph/coreapi/qsgrenderer.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp index ffecfc4806..56a6e0e5d9 100644 --- a/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp @@ -468,7 +468,10 @@ void QSGDefaultRenderer::renderNodes(const QDataBuffer<QSGGeometryNode *> &list) bool changeClip = geomNode->clipList() != m_currentClip; QSGRenderer::ClipType clipType = QSGRenderer::NoClip; if (changeClip) { + // The clip function relies on there not being any depth testing.. + glDisable(GL_DEPTH_TEST); clipType = updateStencilClip(geomNode->clipList()); + glEnable(GL_DEPTH_TEST); m_currentClip = geomNode->clipList(); #ifdef FORCE_NO_REORDER glDepthMask(false); diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp index af118e0717..45aef3481d 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp @@ -486,7 +486,6 @@ QSGRenderer::ClipType QSGRenderer::updateStencilClip(const QSGClipNode *clip) glClearStencil(0); glClear(GL_STENCIL_BUFFER_BIT); glEnable(GL_STENCIL_TEST); - glDisable(GL_DEPTH_TEST); glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glDepthMask(GL_FALSE); @@ -519,12 +518,10 @@ QSGRenderer::ClipType QSGRenderer::updateStencilClip(const QSGClipNode *clip) if (stencilEnabled) { m_clip_program.disableAttributeArray(0); - glEnable(GL_DEPTH_TEST); glStencilFunc(GL_EQUAL, clipDepth, 0xff); // stencil test, ref, test mask glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); // stencil fail, z fail, z pass glStencilMask(0); // write mask bindable()->reactivate(); - //glDepthMask(GL_TRUE); // must be reset correctly by caller. } else { glDisable(GL_STENCIL_TEST); } |