diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-02-28 13:05:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 13:13:51 +0100 |
| commit | 57b34cf8dbad22a1c37bf44753d314dc22c3fc70 (patch) | |
| tree | 9c65b4df026536973178036344fca28fbc2d74a5 /src | |
| parent | 8a03159c32943a7f74bbb97f6f4b7998cb8f5916 (diff) | |
| download | qtquick1-57b34cf8dbad22a1c37bf44753d314dc22c3fc70.tar.gz | |
Revert "Dynamic GL support in Quick1's ShaderEffectSource"
Will need to change to QOpenGLContext::currentContext()->isES()
once the qtbase changes are in.
This reverts commit 3eeaf987123f73ad7a4745745d9e7c70f30942cd.
Change-Id: I7ac8718bc07cbcbaefe1633856722ae402078112
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/shaders/shadereffectsource.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp index b5462c71..f58b5464 100644 --- a/src/imports/shaders/shadereffectsource.cpp +++ b/src/imports/shaders/shadereffectsource.cpp @@ -285,8 +285,7 @@ void ShaderEffectSource::bind() GLuint vwrap = (m_wrapMode == Repeat || m_wrapMode == RepeatVertically) ? GL_REPEAT : GL_CLAMP_TO_EDGE; #if !defined(QT_OPENGL_ES_2) - if (!QOpenGLFunctions::isES()) - glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); #endif if (m_fbo && m_fbo->isValid()) { |