diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
| commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
| tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /examples/qt3d/deferred-renderer-cpp/finaleffect.cpp | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/deferred-renderer-cpp/finaleffect.cpp')
| -rw-r--r-- | examples/qt3d/deferred-renderer-cpp/finaleffect.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp index db51058d9..63c821caa 100644 --- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp +++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp @@ -60,7 +60,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent) , m_gl2Technique(new Qt3DRender::QTechnique()) , m_gl2Pass(new Qt3DRender::QRenderPass()) , m_gl3Pass(new Qt3DRender::QRenderPass()) - , m_passCriterion(new Qt3DRender::QAnnotation(this)) + , m_passCriterion(new Qt3DRender::QFilterKey(this)) { m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL); m_gl3Technique->graphicsApiFilter()->setMajorVersion(3); @@ -79,7 +79,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent) gl3Shader->setVertexShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.vert")))); gl3Shader->setFragmentShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.frag")))); - m_gl3Pass->addAnnotation(m_passCriterion); + m_gl3Pass->addFilterKey(m_passCriterion); m_gl3Pass->setShaderProgram(gl3Shader); m_gl3Technique->addRenderPass(m_gl3Pass); @@ -87,7 +87,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent) gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert")))); gl2Shader->setFragmentShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.frag")))); - m_gl2Pass->addAnnotation(m_passCriterion); + m_gl2Pass->addFilterKey(m_passCriterion); m_gl2Pass->setShaderProgram(gl2Shader); m_gl2Technique->addRenderPass(m_gl2Pass); @@ -95,7 +95,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent) addTechnique(m_gl2Technique); } -QList<Qt3DRender::QAnnotation *> FinalEffect::passCriteria() const +QList<Qt3DRender::QFilterKey *> FinalEffect::passCriteria() const { - return QList<Qt3DRender::QAnnotation *>() << m_passCriterion; + return QList<Qt3DRender::QFilterKey *>() << m_passCriterion; } |