diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-03-09 14:40:47 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-03-09 16:12:01 +0000 |
commit | a21a41759f4fc115f34ce0891fedb255c4d32937 (patch) | |
tree | 240fe5694d7a03585203165ba796a22bead2ee50 /src/render/backend/rendershader_p.h | |
parent | 770beab2ee3c9fc41502e0b0bbc35e2cdc595ce7 (diff) |
Fix for ShaderData
Wasn't using the right index to retrieve the ShaderUniformBlock. Combined with
the use of resize instead of reserve this lead to an unexpected behavior.
Task-number: QTBUG-44874
Change-Id: If66554cf0ea133df33a72a63b256d80a4c4ce823
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/rendershader_p.h')
-rw-r--r-- | src/render/backend/rendershader_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/backend/rendershader_p.h b/src/render/backend/rendershader_p.h index d0a4d1e0e..23d5a8672 100644 --- a/src/render/backend/rendershader_p.h +++ b/src/render/backend/rendershader_p.h @@ -84,6 +84,7 @@ public: QHash<QString, ShaderUniform> activeUniformsForBlock(int blockIndex) const; ShaderUniformBlock uniformBlock(int blockIndex); + ShaderUniformBlock uniformBlock(const QString &blockName); private: QOpenGLShaderProgram *m_program; |