From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Mon, 7 May 2018 23:22:41 +0000 (+1000)
Subject: mesa: dont call _mesa_override_glsl_version() in _mesa_init_constants()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=be3ee9d141b958d41378fa8fd61255b14f5b6e74;p=mesa.git

mesa: dont call _mesa_override_glsl_version() in _mesa_init_constants()

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 <marek.olsak@amd.com>
---

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