ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GLES: Make sure that we are using fixed pipeline when force legacy device is set in graphics restrictions.

Browse Source 
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.
This commit is contained in:
Deve 2016-12-29 16:00:02 +01:00
parent bc2fb1da76
commit 278ef781bf
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/graphical_restrictions.xml
View File

@ -31,4 +31,5 @@
<card contains="ATI" os="windows" version="<=3.1.8787" disable="ForceLegacyDevice"/>
<card os="android" disable="TextureFormatBGRA8888"/>
<card os="android" disable="ColorBufferFloat"/>
<card contains="Android Emulator" os="android" disable="ForceLegacyDevice"/>
</graphical-restrictions>

5
src/graphics/central_settings.cpp
View File

@ -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;