diff options
| author | Paul Lemire <paul.lemire.ecortex@kdab.com> | 2014-11-20 14:30:36 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-12-12 14:17:06 +0100 |
| commit | c16a35679e58d3f1f69aee74b7ef478a9f8669dd (patch) | |
| tree | bc60e76496b80c5ba105492a8f34d1428001ff7e /src/render/backend/renderview_p.h | |
| parent | af6f95dd538f06736349ad42305814177aa81d92 (diff) | |
RenderView: handles Uniform Block values
UniformBlock values now trigger the initialization of the associated
RenderShaderData the first time they are used. Then the pair Uniform Block
index and RenderShaderData QNodeId is added to the QUniformPack.
Change-Id: I6f20ff830f46a9faeeceebfc30162b9438ce8a09
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/renderview_p.h')
| -rw-r--r-- | src/render/backend/renderview_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h index 01e0e7160..22ce76273 100644 --- a/src/render/backend/renderview_p.h +++ b/src/render/backend/renderview_p.h @@ -261,7 +261,7 @@ private: QUniformValue *inverseViewportMatrix(const QMatrix4x4 &model) const; void setUniformValue(QUniformPack &uniformPack, const QString &name, const QVariant &value); - void setUniformBlockValue(QUniformPack &uniformPack, const QVector<QString> &uniformNames, const QString &blockName, const QVariant &value); + void setUniformBlockValue(QUniformPack &uniformPack, RenderShader *shader, const ShaderUniformBlock &block, const QVariant &value); void buildSortingKey(RenderCommand *command); }; |