summaryrefslogtreecommitdiffstats
path: root/src/render/renderstates/renderstateset_p.h
diff options
context:
space:
mode:
authorWieland Hagen <wieland.hagen@kdab.com>2016-01-22 17:29:29 +0100
committerWieland Hagen <wieland.hagen@kdab.com>2016-02-05 16:08:50 +0000
commit5757b17a7535ca2a97f78463e4798242a5dcb508 (patch)
tree9d8e498554eb12c239e5beff31bac14987ef31d9 /src/render/renderstates/renderstateset_p.h
parentdb69d8e51172d9150d57aca1331a904a290bcc76 (diff)
Added QBackendNodes for QRenderStates.
RenderStateNode is the backend node for QRenderStates. The actual state-dependent behavior is implemented in subclasses of RenderStateImpl. Backend nodes for QRenderPass and QStateSet now hold IDs of the RenderState-nodes that they contain, instead of pointers. This means that every frame the RenderView has to get the actual backend nodes while building the RenderStateSets. This needs to be fixed. Change-Id: I908ce9763fdb9f4e851df8dbcecf5dc6ce5a4f49 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/renderstates/renderstateset_p.h')
-rw-r--r--src/render/renderstates/renderstateset_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/renderstates/renderstateset_p.h b/src/render/renderstates/renderstateset_p.h
index 9f2f1440f..a82cb20f0 100644
--- a/src/render/renderstates/renderstateset_p.h
+++ b/src/render/renderstates/renderstateset_p.h
@@ -72,7 +72,7 @@ public:
RenderStateSet();
~RenderStateSet();
- void addState(RenderState* ds);
+ void addState(RenderStateImpl* ds);
/**
* @brief changeCost - metric of cost to change to this state-set from
@@ -94,14 +94,14 @@ private:
* @param ds
* @return
*/
- bool contains(RenderState* ds) const;
+ bool contains(RenderStateImpl* ds) const;
- QVector<RenderState*> m_states;
+ QVector<RenderStateImpl*> m_states;
StateMaskSet m_stateMask;
RenderStateSet* m_cachedPrevious;
- QVector<RenderState*> m_cachedDeltaStates;
+ QVector<RenderStateImpl*> m_cachedDeltaStates;
};
} // namespace Render