id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-02 23:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disabled timing queries when using the Mesa driver #90

Browse source
This commit is contained in:
Robert Beckebans 2014-04-20 17:50:37 +02:00
parent cb83ec194a
commit a8cda090c1
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
neo/renderer/RenderSystem_init.cpp
View file

@ -401,13 +401,11 @@ static void R_CheckPortableExtensions()
glConfig.vendor = VENDOR_INTEL; glConfig.vendor = VENDOR_INTEL;
} }
// RB: HACK for testing: Mesa support // RB: Mesa support
#if defined(__linux__) //!defined(_WIN32) && !defined(__ANDROID__) if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 4 ) == 0 )
//if( glConfig.vendor == VENDOR_INTEL )
{ {
glConfig.driverType = GLDRV_OPENGL_MESA; glConfig.driverType = GLDRV_OPENGL_MESA;
} }
#endif
// RB end // RB end
// GL_ARB_multitexture // GL_ARB_multitexture
@ -617,7 +615,7 @@ static void R_CheckPortableExtensions()
} }
// GL_ARB_timer_query // GL_ARB_timer_query
glConfig.timerQueryAvailable = R_CheckExtension( "GL_ARB_timer_query" ) || R_CheckExtension( "GL_EXT_timer_query" ); glConfig.timerQueryAvailable = ( R_CheckExtension( "GL_ARB_timer_query" ) || R_CheckExtension( "GL_EXT_timer_query" ) ) && glConfig.driverType != GLDRV_OPENGL_MESA;
if( glConfig.timerQueryAvailable ) if( glConfig.timerQueryAvailable )
{ {
qglGetQueryObjectui64vEXT = ( PFNGLGETQUERYOBJECTUI64VEXTPROC )GLimp_ExtensionPointer( "glGetQueryObjectui64vARB" ); qglGetQueryObjectui64vEXT = ( PFNGLGETQUERYOBJECTUI64VEXTPROC )GLimp_ExtensionPointer( "glGetQueryObjectui64vARB" );