summaryrefslogtreecommitdiffstats
path: root/src/mesa/program
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2013-11-20 13:41:23 -0800
committerIan Romanick <[email protected]>2013-12-04 17:22:42 -0800
commit538a7f2a8082e748caa599636c01833332bd039a (patch)
tree6d5bd1877429ad89589f147d69d55c9325c851b7 /src/mesa/program
parente0587fb9d06e868e0c6efe5d44c2204448d3bb12 (diff)
mesa: Use a single enable for GL_EXT_texture_array and GL_MESA_texture_array
Every driver that enables one also enables the other. The difference between the two is MESA adds support for fixed-function and assembly fragment shaders, but EXT only adds support for GLSL. The MESA extension was created back when Mesa did not support GLSL. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/program')
-rw-r--r--src/mesa/program/program_parse_extra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/program/program_parse_extra.c b/src/mesa/program/program_parse_extra.c
index e8e1912eb85..b0e0d8fe7bf 100644
--- a/src/mesa/program/program_parse_extra.c
+++ b/src/mesa/program/program_parse_extra.c
@@ -260,7 +260,7 @@ _mesa_ARBfp_parse_option(struct asm_parser_state *state, const char *option)
option += 5;
if (strcmp(option, "texture_array") == 0) {
- if (state->ctx->Extensions.MESA_texture_array) {
+ if (state->ctx->Extensions.EXT_texture_array) {
state->option.TexArray = 1;
return 1;
}