diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-12-09 16:17:53 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-01-13 16:10:24 +0000 |
| commit | 9add600584ab87c80d439c0d5571994d72af3477 (patch) | |
| tree | a71c20c3764732ea5769043d351e3fb1facb476e /src/render/graphicshelpers | |
| parent | d0ab2359f5b4b23dcd017ed6abb2c063deb98a85 (diff) | |
Rename QUniformPack to ShaderParameterPack
This will make it more clear that it also contains other things
like UBO/SSBO which are pure Uniform values.
Change-Id: I641246798b8c868d7bfdfde381221d9a97ed2d35
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers')
| -rw-r--r-- | src/render/graphicshelpers/graphicscontext.cpp | 4 | ||||
| -rw-r--r-- | src/render/graphicshelpers/graphicscontext_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp index ad13b2812..b91692adc 100644 --- a/src/render/graphicshelpers/graphicscontext.cpp +++ b/src/render/graphicshelpers/graphicscontext.cpp @@ -844,7 +844,7 @@ void GraphicsContext::setRenderer(Renderer *renderer) // It will be easier if the QGraphicContext applies the QUniformPack // than the other way around -void GraphicsContext::setUniforms(QUniformPack &uniforms) +void GraphicsContext::setUniforms(ShaderParameterPack &uniforms) { // Activate textures and update TextureUniform in the pack // with the correct textureUnit @@ -857,7 +857,7 @@ void GraphicsContext::setUniforms(QUniformPack &uniforms) // Update the uniforms with the correct texture unit id's const QHash<QString, const QUniformValue *> &uniformValues = uniforms.uniforms(); for (int i = 0; i < uniforms.textures().size(); ++i) { - const QUniformPack::NamedTexture &namedTex = uniforms.textures().at(i); + const ShaderParameterPack::NamedTexture &namedTex = uniforms.textures().at(i); Texture *t = manager->lookupResource<Texture, TextureManager>(namedTex.texId); const TextureUniform *texUniform = Q_NULLPTR; // TO DO : Rework the way textures are loaded diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h index 845beaf5b..3a4150ea9 100644 --- a/src/render/graphicshelpers/graphicscontext_p.h +++ b/src/render/graphicshelpers/graphicscontext_p.h @@ -144,7 +144,7 @@ public: void specifyIndices(Buffer *buffer); void updateBuffer(Buffer *buffer); - void setUniforms(QUniformPack &uniforms); + void setUniforms(ShaderParameterPack &uniforms); /** * @brief glBufferFor - given a client-side (CPU) buffer, provide the |