mesa: enable AMD_shader_trinary_minmax

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

diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 456ca920111aa9c64d256e30a5467de74507e818..e839caf9ad226bfcf5d17bfedb50c6d4278034a6 100644 (file)
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -543,7 +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),
+   EXT(AMD_shader_trinary_minmax,      true,  false,     dummy_true),
 };
 
 #undef EXT

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f0e1858e420a781b9a7c2ae75786a15978e52786..efda5482ae3fe376a182029092401b4e98392cf8 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -304,6 +304,7 @@ static const struct extension extension_table[] = {
    { "GL_AMD_performance_monitor",                 o(AMD_performance_monitor),                 GL,             2007 },
    { "GL_AMD_seamless_cubemap_per_texture",        o(AMD_seamless_cubemap_per_texture),        GL,             2009 },
    { "GL_AMD_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
+   { "GL_AMD_shader_trinary_minmax",               o(dummy_true),                              GL,             2012 },
    { "GL_AMD_vertex_shader_layer",                 o(AMD_vertex_shader_layer),                 GLC,            2012 },
    { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },
    { "GL_APPLE_packed_pixels",                     o(dummy_true),                              GLL,            2002 },