summaryrefslogtreecommitdiffstats
path: root/src/render/defaults/qpervertexcolormaterial.cpp
diff options
context:
space:
mode:
authorFranck Arrecot <franck.arrecot@kdab.com>2016-03-03 12:57:38 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-03-17 11:25:16 +0000
commitc01bc22c287e58186a285b3f8507711fd982fd05 (patch)
tree77a5b100d5a02de3cf864672590cdde5d4099301 /src/render/defaults/qpervertexcolormaterial.cpp
parenta8371dccd60a097678239edc510e5bb4624b52b8 (diff)
QAnnotation changes
Task-number: QTBUG-51454 Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/defaults/qpervertexcolormaterial.cpp')
-rw-r--r--src/render/defaults/qpervertexcolormaterial.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index edc90d233..6b8db44d9 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -39,7 +39,7 @@
#include "qpervertexcolormaterial.h"
#include "qpervertexcolormaterial_p.h"
-#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qfilterkey.h>
#include <Qt3DRender/qmaterial.h>
#include <Qt3DRender/qeffect.h>
#include <Qt3DRender/qtechnique.h>
@@ -66,7 +66,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
, m_vertexES2RenderPass(new QRenderPass())
, m_vertexGL3Shader(new QShaderProgram())
, m_vertexGL2ES2Shader(new QShaderProgram())
- , m_annotation(new QAnnotation)
+ , m_filterKey(new QFilterKey)
{
}
@@ -133,13 +133,13 @@ void QPerVertexColorMaterialPrivate::init()
m_vertexES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
Q_Q(QPerVertexColorMaterial);
- m_annotation->setParent(q);
- m_annotation->setName(QStringLiteral("renderingStyle"));
- m_annotation->setValue(QStringLiteral("forward"));
+ m_filterKey->setParent(q);
+ m_filterKey->setName(QStringLiteral("renderingStyle"));
+ m_filterKey->setValue(QStringLiteral("forward"));
- m_vertexGL3Technique->addAnnotation(m_annotation);
- m_vertexGL2Technique->addAnnotation(m_annotation);
- m_vertexES2Technique->addAnnotation(m_annotation);
+ m_vertexGL3Technique->addFilterKey(m_filterKey);
+ m_vertexGL2Technique->addFilterKey(m_filterKey);
+ m_vertexES2Technique->addFilterKey(m_filterKey);
m_vertexGL3RenderPass->setShaderProgram(m_vertexGL3Shader);
m_vertexGL2RenderPass->setShaderProgram(m_vertexGL2ES2Shader);