From be3ee9d141b958d41378fa8fd61255b14f5b6e74 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 8 May 2018 09:22:41 +1000 Subject: [PATCH] mesa: dont call _mesa_override_glsl_version() in _mesa_init_constants() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit All drivers that support GLSL will later set their default GLSL versions overriding this override call. They currently all call _mesa_override_glsl_version() again later in order to support overrides. Reviewed-by: Marek Olšák --- src/mesa/main/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 9bd4661bd86..4243e03c5cd 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -638,9 +638,6 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api) consts->MaxGeometryOutputVertices = MAX_GEOMETRY_OUTPUT_VERTICES; consts->MaxGeometryTotalOutputComponents = MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS; - /* Shading language version */ - _mesa_override_glsl_version(consts); - #ifdef DEBUG consts->GenerateTemporaryNames = true; #else -- 2.30.2