From 3eeaf987123f73ad7a4745745d9e7c70f30942cd Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 6 Feb 2014 10:18:11 +0100 Subject: Dynamic GL support in Quick1's ShaderEffectSource Not strictly necessary but it is better not to call glEnable() with values that are not supported by GLES2. This way the error state will not polluted by an invalid_enum or similar. Change-Id: I952273f1814d9f124e5c4baa6196386645202439 Reviewed-by: Friedemann Kleint Reviewed-by: Gunnar Sletta --- src/imports/shaders/shadereffectsource.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/imports') 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()) { -- cgit v1.2.3