[android] disable GLSL and set width/height according to the size detected by the driver

This commit is contained in:
Lucas Baudin 2016-02-26 18:04:03 +01:00
parent 86d1ca811a
commit d88f414f96

View File

@ -571,6 +571,10 @@ void IrrDriver::initDevice()
m_sync = 0; m_sync = 0;
m_actual_screen_size = m_video_driver->getCurrentRenderTargetSize(); m_actual_screen_size = m_video_driver->getCurrentRenderTargetSize();
#ifdef ANDROID // resolution is not configurable, and we can not predict it before creating the driver, so let's set the width/height now to avoid glitches
UserConfigParams::m_width = m_actual_screen_size.Width;
UserConfigParams::m_height = m_actual_screen_size.Height;
#endif
m_spherical_harmonics = new SphericalHarmonics(m_scene_manager->getAmbientLight().toSColor()); m_spherical_harmonics = new SphericalHarmonics(m_scene_manager->getAmbientLight().toSColor());
@ -2215,9 +2219,11 @@ void IrrDriver::update(float dt)
if (world) if (world)
{ {
#ifndef ANDROID
if (CVS->isGLSL()) if (CVS->isGLSL())
renderGLSL(dt); renderGLSL(dt);
else else
#endif
renderFixed(dt); renderFixed(dt);
GUIEngine::Screen* current_screen = GUIEngine::getCurrentScreen(); GUIEngine::Screen* current_screen = GUIEngine::getCurrentScreen();