summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-10-28 14:24:53 +0100
committerMarek Olšák <[email protected]>2012-10-31 01:58:12 +0100
commitd012e6d8fe2f4f1139af9e47a684960e8cde103e (patch)
treea4d97a71bdb648393c1c0a8da20a4d5818dd1865
parent3bba7c5ab41405bd73bee1612e65d65bb3ac658d (diff)
mesa: remove ARB_transpose_matrix extension enable flag
Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mesa/drivers/dri/swrast/swrast.c1
-rw-r--r--src/mesa/main/extensions.c4
-rw-r--r--src/mesa/main/mtypes.h1
3 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index eeeb81c0159..73a7580482b 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -648,7 +648,6 @@ swrast_init_driver_functions(struct dd_function_table *driver)
static const char *es2_extensions[] = {
/* Used by mesa internally (cf all_mesa_extensions in ../common/utils.c) */
- "GL_ARB_transpose_matrix",
"GL_ARB_window_pos",
"GL_EXT_blend_func_separate",
"GL_EXT_compiled_vertex_array",
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 71ea10db2e6..4f53357121e 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -146,7 +146,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_transform_feedback2", o(ARB_transform_feedback2), GL, 2010 },
{ "GL_ARB_transform_feedback3", o(ARB_transform_feedback3), GL, 2010 },
{ "GL_ARB_transform_feedback_instanced", o(ARB_transform_feedback_instanced), GL, 2011 },
- { "GL_ARB_transpose_matrix", o(ARB_transpose_matrix), GLL, 1999 },
+ { "GL_ARB_transpose_matrix", o(dummy_true), GLL, 1999 },
{ "GL_ARB_uniform_buffer_object", o(ARB_uniform_buffer_object), GL, 2009 },
{ "GL_ARB_vertex_array_bgra", o(EXT_vertex_array_bgra), GL, 2008 },
{ "GL_ARB_vertex_array_object", o(dummy_true), GL, 2006 },
@@ -357,7 +357,6 @@ name_to_offset(const char* name)
* XXX: Should these defaults also apply to GLES?
*/
static const size_t default_extensions[] = {
- o(ARB_transpose_matrix),
o(ARB_window_pos),
o(EXT_compiled_vertex_array),
@@ -494,7 +493,6 @@ _mesa_enable_1_3_extensions(struct gl_context *ctx)
ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
- /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/
}
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c1dafdade7c..a419d7adc91 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2986,7 +2986,6 @@ struct gl_extensions
GLboolean ARB_transform_feedback2;
GLboolean ARB_transform_feedback3;
GLboolean ARB_transform_feedback_instanced;
- GLboolean ARB_transpose_matrix;
GLboolean ARB_uniform_buffer_object;
GLboolean ARB_vertex_program;
GLboolean ARB_vertex_shader;