From 0327e2e22840e669e1653a34bbd1a68b2bfdca9a Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer@kdab.com>
Date: Sun, 17 Jan 2016 11:09:33 +0000
Subject: Fix annotations in QSkyboxEntity default

Change-Id: I31ac1aba277a472577e1ba03c766dc4f1bf01f30
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
---
 src/render/defaults/qskyboxentity.cpp | 10 ++++++++++
 src/render/defaults/qskyboxentity_p.h |  2 ++
 2 files changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index df44af9bb..4c23e6b49 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -38,6 +38,7 @@
 #include "qskyboxentity_p.h"
 
 #include <Qt3DCore/qtransform.h>
+#include <Qt3DRender/qannotation.h>
 #include <Qt3DRender/qeffect.h>
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qmaterial.h>
@@ -70,6 +71,7 @@ QSkyboxEntityPrivate::QSkyboxEntityPrivate()
     , m_gl2Technique(new QTechnique())
     , m_es2Technique(new QTechnique())
     , m_gl3Technique(new QTechnique())
+    , m_annotation(new QAnnotation)
     , m_gl2RenderPass(new QRenderPass())
     , m_es2RenderPass(new QRenderPass())
     , m_gl3RenderPass(new QRenderPass())
@@ -111,6 +113,14 @@ void QSkyboxEntityPrivate::init()
     m_es2Technique->graphicsApiFilter()->setMajorVersion(0);
     m_es2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
+    m_annotation->setParent(m_effect);
+    m_annotation->setName(QStringLiteral("renderingStyle"));
+    m_annotation->setValue("forward");
+
+    m_gl3Technique->addAnnotation(m_annotation);
+    m_gl2Technique->addAnnotation(m_annotation);
+    m_es2Technique->addAnnotation(m_annotation);
+
     m_gl3RenderPass->setShaderProgram(m_gl3Shader);
     m_gl2RenderPass->setShaderProgram(m_gl2es2Shader);
     m_es2RenderPass->setShaderProgram(m_gl2es2Shader);
diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h
index 6af4be384..bbe49de75 100644
--- a/src/render/defaults/qskyboxentity_p.h
+++ b/src/render/defaults/qskyboxentity_p.h
@@ -59,6 +59,7 @@ class QTransform;
 
 namespace Qt3DRender {
 
+class QAnnotation;
 class QTextureCubeMap;
 class QShaderProgram;
 class QSkyboxEntity;
@@ -87,6 +88,7 @@ class QSkyboxEntityPrivate : public Qt3DCore::QEntityPrivate
     QTechnique *m_gl2Technique;
     QTechnique *m_es2Technique;
     QTechnique *m_gl3Technique;
+    QAnnotation *m_annotation;
     QRenderPass *m_gl2RenderPass;
     QRenderPass *m_es2RenderPass;
     QRenderPass *m_gl3RenderPass;
-- 
cgit v1.2.3