[Mesa-dev] [PATCH] glcpp: Make sure GL_AMD_shader_trinary_minmax is defined

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

The define was only available if
gl_extensions::AMD_shader_trinary_minmax was set, but no driver set it.
Since the extension is advertised by default, remove that field too.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Cc: Maxence Le Doré <maxence.ledore at gmail.com>
CC: Kenneth Graunke <kenneth at whitecape.org>
---
 src/glsl/glcpp/glcpp-parse.y | 5 ++---
 src/mesa/main/mtypes.h       | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index 184e5c2..8b486d2 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -2043,6 +2043,8 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
 	} else {
 	   add_builtin_define(parser, "GL_ARB_draw_buffers", 1);
 	   add_builtin_define(parser, "GL_ARB_texture_rectangle", 1);
+           add_builtin_define(parser, "GL_AMD_shader_trinary_minmax", 1);
+
 
 	   if (extensions != NULL) {
 	      if (extensions->EXT_texture_array)
@@ -2108,9 +2110,6 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
 	      if (extensions->ARB_shader_atomic_counters)
 	         add_builtin_define(parser, "GL_ARB_shader_atomic_counters", 1);
 
-	      if (extensions->AMD_shader_trinary_minmax)
-	         add_builtin_define(parser, "GL_AMD_shader_trinary_minmax", 1);
-
 	      if (extensions->ARB_viewport_array)
 	         add_builtin_define(parser, "GL_ARB_viewport_array", 1);
 	   }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ad83d26..6b2bbee 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3489,7 +3489,6 @@ struct gl_extensions
    /* vendor extensions */
    GLboolean AMD_performance_monitor;
    GLboolean AMD_seamless_cubemap_per_texture;
-   GLboolean AMD_shader_trinary_minmax;
    GLboolean AMD_vertex_shader_layer;
    GLboolean APPLE_object_purgeable;
    GLboolean ATI_envmap_bumpmap;
-- 
1.8.1.4