summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-11-29 10:21:16 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-11-29 14:35:40 +0000
commit800c71ca816d76ac4de0616bf54b87f3c1f14c0a (patch)
treec00b0d5740d7ba7844474f954b33b160897e28f5
parenta02a48fc50203350c631dcb2032737a22a19b81b (diff)
Fix decoding of multi-planar surfaces (YUV video)
QOpenGLTexture::bind() expects texture unit number as plain uint number (e.g. 0,1,2) and not as GLenum (GL_TEXTURE1) Task-number: QTBUG-64841 Change-Id: Id471fc9976677ac8a358f04b9ae09c6a32beef63 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 998250db6..4b6da1e38 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -221,13 +221,13 @@ void QWaylandBufferMaterial::bind()
switch (m_textures.size()) {
case 3:
if (m_textures[2])
- m_textures[2]->bind(GL_TEXTURE2);
+ m_textures[2]->bind(2);
case 2:
if (m_textures[1])
- m_textures[1]->bind(GL_TEXTURE1);
+ m_textures[1]->bind(1);
case 1:
if (m_textures[0])
- m_textures[0]->bind(GL_TEXTURE0);
+ m_textures[0]->bind(0);
}
}