From 9147482a370aa7764231a56b5e20e07bcceb5da8 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Wed, 20 Aug 2014 13:07:59 +0200 Subject: [PATCH] Added check for Gallium drivers to use GLSL ES 3.00. #137 --- neo/idlib/Lib.h | 8 ++++---- neo/renderer/RenderSystem_init.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/neo/idlib/Lib.h b/neo/idlib/Lib.h index 3400f1aa..f831fabd 100644 --- a/neo/idlib/Lib.h +++ b/neo/idlib/Lib.h @@ -62,12 +62,12 @@ public: static void ShutDown(); // wrapper to idCommon functions - static void Printf( VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 1, 2 ); - static void PrintfIf( const bool test, VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 2, 3 ); + static void Printf( VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 1, 2 ); + static void PrintfIf( const bool test, VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 2, 3 ); NO_RETURN static void Error( VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 1, 2 ); NO_RETURN static void FatalError( VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 1, 2 ); - static void Warning( VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 1, 2 ); - static void WarningIf( const bool test, VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 2, 3 ); + static void Warning( VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 1, 2 ); + static void WarningIf( const bool test, VERIFY_FORMAT_STRING const char* fmt, ... ) ID_STATIC_ATTRIBUTE_PRINTF( 2, 3 ); // the extra check for mainThreadInitialized is necessary for this to be accurate // when called by startup code that happens before idLib::Init diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index 36a9f57f..aad44109 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -342,7 +342,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", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "Gallium", 7 ) == 0 ) { glConfig.driverType = GLDRV_OPENGL_MESA; }