From 278ef781bf68cfbac897c1981b50e65cbf080bb6 Mon Sep 17 00:00:00 2001 From: Deve Date: Thu, 29 Dec 2016 16:00:02 +0100 Subject: [PATCH] GLES: Make sure that we are using fixed pipeline when force legacy device is set in graphics restrictions. It is generally safe for GLES drivers. The driver often reports OpenGL ES 3.1 or 3.0 support even though we request only GLES 2.0. But we can still use GLES 2.0 / GLSL 1.0 functions on GLES 3.x context, so it shouldn't cause any issues. I also added Android Emulator to graphics restrictions. --- data/graphical_restrictions.xml | 1 + src/graphics/central_settings.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/data/graphical_restrictions.xml b/data/graphical_restrictions.xml index 67f70c876..48d47dfeb 100644 --- a/data/graphical_restrictions.xml +++ b/data/graphical_restrictions.xml @@ -31,4 +31,5 @@ + diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp index 2aac1406f..dbe7ad034 100644 --- a/src/graphics/central_settings.cpp +++ b/src/graphics/central_settings.cpp @@ -220,6 +220,11 @@ void CentralVideoSettings::init() m_need_srgb_visual_workaround = (param != GL_SRGB); } #else + if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_FORCE_LEGACY_DEVICE)) + { + m_glsl = false; + } + if (m_glsl == true) { hasTextureStorage = true;