summaryrefslogtreecommitdiffstats
path: root/src/render/renderers/opengl/renderer/rendercommand_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/renderers/opengl/renderer/rendercommand_p.h')
-rw-r--r--src/render/renderers/opengl/renderer/rendercommand_p.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/render/renderers/opengl/renderer/rendercommand_p.h b/src/render/renderers/opengl/renderer/rendercommand_p.h
index e1cf7a4e0..44e34ecfb 100644
--- a/src/render/renderers/opengl/renderer/rendercommand_p.h
+++ b/src/render/renderers/opengl/renderer/rendercommand_p.h
@@ -72,6 +72,7 @@ namespace Render {
class RenderStateSet;
using RenderStateSetPtr = QSharedPointer<RenderStateSet>;
+class GLShader;
class Q_AUTOTEST_EXPORT RenderCommand
{
@@ -79,8 +80,9 @@ public:
RenderCommand();
HVao m_vao; // VAO used during the submission step to store all states and VBOs
- HShader m_shader; // Shader for given pass and mesh
HMaterial m_material; // Purely used to ease sorting (minimize stage changes, binding changes ....)
+ GLShader *m_glShader; // GL Shader to be used at render time
+ Qt3DCore::QNodeId m_shaderId; // Shader for given pass and mesh
ShaderParameterPack m_parameterPack; // Might need to be reworked so as to be able to destroy the
// Texture while submission is happening.
RenderStateSetPtr m_stateSet;
@@ -97,7 +99,6 @@ public:
float m_depth;
int m_changeCost;
- uint m_shaderDna;
enum CommandType {
Draw,