summaryrefslogtreecommitdiffstats
path: root/src/render/graphicshelpers/graphicscontext_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-04-25 11:06:47 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-04-26 08:44:28 +0000
commit5197a01b9f0a451d60f20b9db4d88afb2c8d44c7 (patch)
treedcbcac5dab1a87c7c1e362b58fff4711ac8a7fbc /src/render/graphicshelpers/graphicscontext_p.h
parent6d6c5702ad6a027dd26c1e47245c5952c50e1b66 (diff)
Technique/Renderer: use GraphicsShaderData
Instead of creating QGraphicsApiFilter objects... Change-Id: Idc723bdea9b97fef547170bd7dca386e5ca4f519 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers/graphicscontext_p.h')
-rw-r--r--src/render/graphicshelpers/graphicscontext_p.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h
index 1cb977b82..37cedcd5a 100644
--- a/src/render/graphicshelpers/graphicscontext_p.h
+++ b/src/render/graphicshelpers/graphicscontext_p.h
@@ -65,6 +65,7 @@
#include <Qt3DRender/private/glbuffer_p.h>
#include <Qt3DRender/qattribute.h>
#include <Qt3DRender/private/handle_types_p.h>
+#include <Qt3DRender/private/qgraphicsapifilter_p.h>
QT_BEGIN_NAMESPACE
@@ -74,8 +75,6 @@ class QAbstractOpenGLFunctions;
namespace Qt3DRender {
-class QGraphicsApiFilter;
-
namespace Render {
class Renderer;
@@ -173,7 +172,7 @@ public:
void setCurrentStateSet(RenderStateSet* ss);
RenderStateSet *currentStateSet() const;
- QGraphicsApiFilter *contextInfo() const;
+ const GraphicsApiFilterData *contextInfo() const;
// Wrapper methods
void alphaTest(GLenum mode1, GLenum mode2);
@@ -277,7 +276,7 @@ private:
RenderStateSet* m_stateSet;
Renderer *m_renderer;
- QGraphicsApiFilter *m_contextInfo;
+ GraphicsApiFilterData m_contextInfo;
QByteArray m_uboTempArray;