summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis-Francis Ratté-Boulianne <lfrb@collabora.com>2014-11-18 12:44:34 -0500
committerLouis-Francis Ratté-Boulianne <lfrb@collabora.com>2014-11-18 12:45:43 -0500
commiteb080a838353c2c82baaa2124e489d02a83c4ef1 (patch)
tree1c5d33e260574c1ddc980d2b33a13abd58f4610a
parentvcl: Update current context before executing scale operation (diff)
downloadcore-eb080a838353c2c82baaa2124e489d02a83c4ef1.tar.gz
core-eb080a838353c2c82baaa2124e489d02a83c4ef1.zip
vcl: Make sure the texture unit is the right one before binding
Change-Id: I392190a6927a6eb725c86bcf5278e3cd4491eb5c
-rw-r--r--vcl/opengl/texture.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 938de5428374..c8f46848e6d6 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -244,6 +244,7 @@ bool OpenGLTexture::Draw()
aTexCoord[3] = aTexCoord[5] = maRect.Bottom() / (double) mpImpl->mnHeight;
}
+ glActiveTexture( GL_TEXTURE0 );
glBindTexture( GL_TEXTURE_2D, mpImpl->mnTexture );
glEnableVertexAttribArray( 0 );
glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 0, aPosition );