summaryrefslogtreecommitdiffstats
path: root/src/render/graphicshelpers
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-12-08 12:25:38 +0100
committerPaul Lemire <paul.lemire@kdab.com>2016-01-13 14:02:44 +0000
commit8a8746f7011ce6a831df715120cbd54a3938e2a4 (patch)
tree2a7f36758089970d046f1239c430e0a3d46145b2 /src/render/graphicshelpers
parent45e8d67176b37c56c0403590a5f721e980101148 (diff)
GLBuffer: modified to be used as a generic GL buffer
Change-Id: I6e3b763864587ac4b12f6a458f84d3642f20b32c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/graphicshelpers')
-rw-r--r--src/render/graphicshelpers/graphicscontext.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/graphicshelpers/graphicscontext.cpp b/src/render/graphicshelpers/graphicscontext.cpp
index dada9e8b8..8fa9bba61 100644
--- a/src/render/graphicshelpers/graphicscontext.cpp
+++ b/src/render/graphicshelpers/graphicscontext.cpp
@@ -904,14 +904,14 @@ void GraphicsContext::setUniforms(QUniformPack &uniforms)
// Allocate ubo if not allocated previously
if (!ubo->isCreated()) {
ubo->create(this);
- ubo->bind(this);
+ ubo->bind(this, GLBuffer::UniformBuffer);
ubo->allocate(this, block.m_size);
}
// update the ubo if needed
if (blockToUbos[i].m_needsUpdate) {
if (!ubo->isBound())
- ubo->bind(this);
+ ubo->bind(this, GLBuffer::UniformBuffer);
needsToUnbindUBO |= true;
const QHash<QString, ShaderUniform> &activeUniformsInBlock = m_activeShader->activeUniformsForUniformBlock(block.m_index);
const QHash<QString, ShaderUniform>::const_iterator uniformsEnd = activeUniformsInBlock.end();