From 83d818167590bdb4e979f2cebf66501fb71e066c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 12 Aug 2016 15:46:55 +0200 Subject: [PATCH] [libkwinglutils] Revert version hack for Qualcomm Adreno on libhybris The idea to set proper version is good, but it results in epoxy thinking it does not have the entry points and terminating KWin. --- .../data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 | 2 +- libkwineffects/kwinglplatform.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/autotests/libkwineffects/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 b/autotests/libkwineffects/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 index 53790d50a5..c1d157c0c4 100644 --- a/autotests/libkwineffects/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 +++ b/autotests/libkwineffects/data/glplatform/qualcomm-adreno-330-libhybris-gles-3.0 @@ -7,7 +7,7 @@ ShadingLanguageVersion=OpenGL ES GLSL ES 3.00 [Settings] GLSL=true TextureNPOT=true -GLVersion=3,0 +GLVersion=2,0 GLSLVersion=3,0 GLES=true Adreno=true diff --git a/libkwineffects/kwinglplatform.cpp b/libkwineffects/kwinglplatform.cpp index 584abf8c9a..6e52a3c105 100644 --- a/libkwineffects/kwinglplatform.cpp +++ b/libkwineffects/kwinglplatform.cpp @@ -800,12 +800,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface) else if (m_vendor == "Qualcomm") { m_driver = Driver_Qualcomm; m_chipClass = detectQualcommClass(m_renderer); - // version specific overwrite for libhybris disabling OpenGL ES 3 - if (isGLES() && m_glVersion == kVersionNumber(2, 0) && m_glslVersion >= kVersionNumber(3, 0)) { - if (m_version.contains("OpenGL ES 3.0")) { - m_glVersion = kVersionNumber(3, 0); - } - } } else if (m_renderer == "Software Rasterizer") {