OGL32CTX: Use the userconfig parameter to decide to use glsl.

Queried extensions does seems to disable glsl when using a core context.
This commit is contained in:
Vincent Lejeune 2014-01-17 19:28:26 +01:00
parent 2500c6cb49
commit 5a5a39f586

View File

@ -413,8 +413,12 @@ void IrrDriver::initDevice()
m_scene_manager = m_device->getSceneManager();
m_gui_env = m_device->getGUIEnvironment();
m_video_driver = m_device->getVideoDriver();
m_glsl = m_video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
m_video_driver->queryFeature(video::EVDF_TEXTURE_NPOT) &&
m_glsl =
#if defined(__APPLE__)
#else
m_video_driver->queryFeature(video::EVDF_ARB_GLSL) &&
m_video_driver->queryFeature(video::EVDF_TEXTURE_NPOT) &&
#endif
UserConfigParams::m_pixel_shaders;
// This remaps the window, so it has to be done before the clear to avoid flicker