Mesa (master): mesa: dont call _mesa_override_glsl_version() in _mesa_init_constants()

Timothy Arceri tarceri at kemper.freedesktop.org
Wed May 9 04:30:23 UTC 2018


Module: Mesa
Branch: master
Commit: be3ee9d141b958d41378fa8fd61255b14f5b6e74
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=be3ee9d141b958d41378fa8fd61255b14f5b6e74

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue May  8 09:22:41 2018 +1000

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 at amd.com>

---

 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 9bd4661bd8..4243e03c5c 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




More information about the mesa-commit mailing list