aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph/qsgcontext.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@jollamobile.com>2014-06-09 11:41:03 +0200
committerGunnar Sletta <gunnar.sletta@jollamobile.com>2014-06-23 08:04:15 +0200
commit5dd2e2b895af03f0aaa0ffaef7615ff41960cec6 (patch)
treee3d4c25163963ddea852c05536a9574e5de62f7e /src/quick/scenegraph/qsgcontext.cpp
parentd757806537a1e7233bd656e4d2170cfa994d9d44 (diff)
Make sure program is bound before calling initialize().
Some implementations will use the initialization to set constant uniforms like texture locations, so bind the program before so this will work. Task-number: QTBUG-39472 Change-Id: I677c5aeefe68535bd4805e83b93308d0bd090030 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/quick/scenegraph/qsgcontext.cpp')
-rw-r--r--src/quick/scenegraph/qsgcontext.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 6a69ea02db..9328c302d4 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -644,6 +644,7 @@ void QSGRenderContext::compile(QSGMaterialShader *shader, QSGMaterial *material,
void QSGRenderContext::initialize(QSGMaterialShader *shader)
{
+ shader->program()->bind();
shader->initialize();
}