diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 16:10:18 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:16:49 +0200 |
| commit | 9f77d558daef14e0cbf5f6b69a3f2db574c78282 (patch) | |
| tree | 57337a46ea542bef3a8aea12f5f8602716456c98 /examples/deferred-renderer-cpp/sceneeffect.cpp | |
| parent | f71b69495c1ebb6e43b1d51a768fdc87595a65f2 (diff) | |
QRenderPass: renamed criteria property to annotations
Change-Id: Id824323880a3cf310adb1c581c440eeff9451d4f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/deferred-renderer-cpp/sceneeffect.cpp')
| -rw-r--r-- | examples/deferred-renderer-cpp/sceneeffect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/deferred-renderer-cpp/sceneeffect.cpp b/examples/deferred-renderer-cpp/sceneeffect.cpp index f67c070e7..0e2a62c4e 100644 --- a/examples/deferred-renderer-cpp/sceneeffect.cpp +++ b/examples/deferred-renderer-cpp/sceneeffect.cpp @@ -71,7 +71,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent) gl3Shader->setVertexShaderSourceFile(QStringLiteral(":/geometry_gl3.vert")); gl3Shader->setFragmentShaderSourceFile(QStringLiteral(":/geometry_gl3.frag")); - m_gl3Pass->addCriterion(m_passCriterion); + m_gl3Pass->addAnnotation(m_passCriterion); m_gl3Pass->setShaderProgram(gl3Shader); m_gl3Technique->addPass(m_gl3Pass); @@ -79,7 +79,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent) gl2Shader->setVertexShaderSourceFile(QStringLiteral(":/geometry_gl2.vert")); gl2Shader->setFragmentShaderSourceFile(QStringLiteral(":/geometry_gl2.frag")); - m_gl2Pass->addCriterion(m_passCriterion); + m_gl2Pass->addAnnotation(m_passCriterion); m_gl2Pass->setShaderProgram(gl2Shader); m_gl2Technique->addPass(m_gl2Pass); |