diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 20:04:29 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 20:04:29 +0100 |
| commit | 7a2f602d3ab453c3a0724f4084d95140b1086c35 (patch) | |
| tree | cf508e1ddc7e739c4ad1ba875ee8ac681a3257b3 /src/imports | |
| parent | a0d27513f4eff3f76fd85e6442aca443b7c05a53 (diff) | |
| parent | 3eeaf987123f73ad7a4745745d9e7c70f30942cd (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia3d0ffbe6ba6c8c34ec1ca2961953797d82ce282
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/shaders/shadereffectsource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index f58b5464..b5462c71 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -285,7 +285,8 @@ void ShaderEffectSource::bind() GLuint vwrap = (m_wrapMode == Repeat || m_wrapMode == RepeatVertically) ? GL_REPEAT : GL_CLAMP_TO_EDGE; #if !defined(QT_OPENGL_ES_2) - glEnable(GL_TEXTURE_2D); + if (!QOpenGLFunctions::isES()) + glEnable(GL_TEXTURE_2D); #endif if (m_fbo && m_fbo->isValid()) { |