summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxence Le Doré <maxence.ledore@gmail.com>2014-01-03 00:09:54 +0100
committerKenneth Graunke <kenneth@whitecape.org>2014-01-06 14:28:10 -0800
commit1a9e8c23eb936bb165879ca52348ecb06a8b4701 (patch)
tree912b4b902a4eaaee178f4f662e61a0c10e44c3db
parenteb5dc75601708d2d9bdf822960ae5b9151c105a1 (diff)
mesa: enable AMD_shader_trinary_minmax
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/glsl/glsl_parser_extras.cpp2
-rw-r--r--src/mesa/main/extensions.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 456ca92011..e839caf9ad 100644
--- 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 f0e1858e42..efda5482ae 100644
--- 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 },