diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-11-08 16:56:12 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-08 08:06:50 +0100 |
| commit | 9eeb1389f57bc4c0cfd205c7d1aaaa8fe069f81e (patch) | |
| tree | 773311979245e673cd02dde1626c649819382e06 /src/imports/multimedia/qsgvideonode_i420.cpp | |
| parent | 0a95ccb8f41ffa129daf3eb307f2d3fc27a194d6 (diff) | |
Change the order textures are bound.
Leave texture unit 0 active at the end, since the active texture unit
is not restored by SG itself.
Change-Id: I4970a955fea5c9342cc93c1d1b07ffbfb71e5f04
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qsgvideonode_i420.cpp')
| -rw-r--r-- | src/imports/multimedia/qsgvideonode_i420.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/multimedia/qsgvideonode_i420.cpp b/src/imports/multimedia/qsgvideonode_i420.cpp index 11135c14b..e71ea6ec7 100644 --- a/src/imports/multimedia/qsgvideonode_i420.cpp +++ b/src/imports/multimedia/qsgvideonode_i420.cpp @@ -278,12 +278,12 @@ void QSGVideoMaterialShader_YUV420::updateState(const RenderState &state, program()->setUniformValue(m_id_uTexture, 1); program()->setUniformValue(m_id_vTexture, 2); - functions->glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, mat->idY); functions->glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, mat->idU); functions->glActiveTexture(GL_TEXTURE2); glBindTexture(GL_TEXTURE_2D, mat->idV); + functions->glActiveTexture(GL_TEXTURE0); // Finish with 0 as default texture unit + glBindTexture(GL_TEXTURE_2D, mat->idY); program()->setUniformValue(m_id_colorMatrix, mat->colorMatrix); if (state.isOpacityDirty()) { |