From 01be91c9c8ad2d69230aee180fa71949b940eaa2 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 9 Aug 2017 16:58:27 +0100 Subject: [PATCH] Fix detection of Mesa >= 17.2. This handles accelerated drivers (vendor == "X.Org") and software rendering (llvmpipe). --- neo/renderer/RenderSystem_init.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index d7ff7e19..b45e4a23 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -390,7 +390,9 @@ 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 || idStr::Icmpn( glConfig.renderer_string, "Gallium", 7 ) == 0 ) + if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 5 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "Gallium", 7 ) == 0 || + strcmp( glConfig.vendor_string, "X.Org" ) == 0 || + idStr::Icmpn( glConfig.renderer_string, "llvmpipe", 8 ) == 0 ) { if( glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE ) {