Merge branch 'master' into glew and fixed a crash on Intel HD drivers

This commit is contained in:
Robert Beckebans 2013-04-23 00:43:00 +02:00
parent aefa4ac6e3
commit fe22638fdd
3 changed files with 5 additions and 3 deletions

View file

@ -386,7 +386,7 @@ static void R_CheckPortableExtensions()
glConfig.occlusionQueryAvailable = GLEW_ARB_occlusion_query != 0;
// GL_ARB_timer_query
glConfig.timerQueryAvailable = GLEW_ARB_timer_query != 0 || GLEW_EXT_timer_query != 0;
glConfig.timerQueryAvailable = ( GLEW_ARB_timer_query != 0 || GLEW_EXT_timer_query != 0 ) && ( glConfig.vendor != VENDOR_INTEL || r_skipIntelWorkarounds.GetBool() );
// GL_ARB_debug_output
glConfig.debugOutputAvailable = GLEW_ARB_debug_output != 0;