[android] less hacky way to disable glsl

This commit is contained in:
Lucas Baudin 2016-02-26 19:40:52 +01:00
parent d88f414f96
commit 5e125ee5c1
2 changed files with 4 additions and 2 deletions

View File

@ -447,7 +447,11 @@ namespace UserConfigParams
PARAM_DEFAULT( IntUserConfigParam(120, "max_fps",
&m_video_group, "Maximum fps, should be at least 60") );
PARAM_PREFIX BoolUserConfigParam m_force_legacy_device
#ifndef ANDROID
PARAM_DEFAULT(BoolUserConfigParam(false, "force_legacy_device",
#else
PARAM_DEFAULT(BoolUserConfigParam(true, "force_legacy_device",
#endif
&m_video_group, "Force OpenGL 2 context, even if OpenGL 3 is available."));
PARAM_PREFIX BoolUserConfigParam m_texture_compression

View File

@ -2219,11 +2219,9 @@ void IrrDriver::update(float dt)
if (world)
{
#ifndef ANDROID
if (CVS->isGLSL())
renderGLSL(dt);
else
#endif
renderFixed(dt);
GUIEngine::Screen* current_screen = GUIEngine::getCurrentScreen();