From 6a906704c5555ef3ea614069cdd4f31d334c2ab0 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Sun, 9 Nov 2014 11:24:37 +0100 Subject: [PATCH] Made GL_ARB_multitexture exception for OpenGL core profiles and Mesa #189 --- neo/renderer/RenderSystem_init.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp index 2678ef38..b4f12cba 100644 --- a/neo/renderer/RenderSystem_init.cpp +++ b/neo/renderer/RenderSystem_init.cpp @@ -353,7 +353,14 @@ static void R_CheckPortableExtensions() // RB end // GL_ARB_multitexture - glConfig.multitextureAvailable = GLEW_ARB_multitexture != 0; + if( glConfig.driverType == GLDRV_OPENGL32_COMPATIBILITY_PROFILE || glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE || glConfig.driverType == GLDRV_OPENGL_MESA ) + { + glConfig.multitextureAvailable = true; + } + else + { + glConfig.multitextureAvailable = GLEW_ARB_multitexture != 0; + } // GL_EXT_direct_state_access glConfig.directStateAccess = GLEW_EXT_direct_state_access != 0;