glsl: Add extension tracking for AMD_shader_trinary_minmax

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index ef084b6392a7a1e6abdad02fe1b75fc71f983466..55c498195615621b7656fc792df3c2d4927c5047 100644 (file)
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -1281,6 +1281,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
 
              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);
           }
        }
 

diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index fc9a8b204119695c762fa42aab3ab6ac7fc5d2c2..456ca920111aa9c64d256e30a5467de74507e818 100644 (file)
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -543,6 +543,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
    EXT(ARB_texture_gather,             true,  false,     ARB_texture_gather),
    EXT(ARB_shader_atomic_counters,     true,  false,     ARB_shader_atomic_counters),
    EXT(ARB_sample_shading,             true,  false,     ARB_sample_shading),
+   EXT(AMD_shader_trinary_minmax,      true,  false,     dummy_false),
 };
 
 #undef EXT

diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
index 7b013fa6dee9c5a8656320f2370cfe2123a61ef4..0e281ae203e393618e0614c9c023c8cb271a32ab 100644 (file)
--- a/src/glsl/glsl_parser_extras.h
+++ b/src/glsl/glsl_parser_extras.h
@@ -350,6 +350,8 @@ struct _mesa_glsl_parse_state {
    bool EXT_shader_integer_mix_warn;
    bool ARB_shader_atomic_counters_enable;
    bool ARB_shader_atomic_counters_warn;
+   bool AMD_shader_trinary_minmax_enable;
+   bool AMD_shader_trinary_minmax_warn;
    /*@}*/
 
    /** Extensions supported by the OpenGL implementation. */

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f93bb56410d764da5da4ac9e040f63cf4be99d7c..a5294b018586738cb7af50edad8d44c3bdc1e91b 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3435,6 +3435,7 @@ 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;