Merge branch 'master' into glew

This commit is contained in:
RobertBeckebans 2014-04-25 20:24:30 +02:00
commit 60ccf3567b
10 changed files with 213 additions and 75 deletions

View file

@ -295,7 +295,7 @@ static void R_CheckPortableExtensions()
}
// RB: Mesa support
if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 4 ) == 0 )
if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 5 ) == 0 )
{
glConfig.driverType = GLDRV_OPENGL_MESA;
}