diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2013-09-13 11:31:00 -0500 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2013-10-01 14:10:40 -0700 |
commit | 421141192f0c35f8cb7dd4580a4fdedc7bb60104 (patch) | |
tree | d93bce6c57253ba49aed1abc470ebe2b058f75fb | |
parent | be029eb993b17f7e8c1c0b0fb52c6dba370cef28 (diff) |
mesa: Remove all traces of GL_OES_matrix_get
I believe this extension was enabled by accident. As far as I can tell,
there has never been any code in Mesa to actually support it. Not only
that, this extension is only useful in the common-lite profile, and Mesa
does the common profile.
This "fixes" the piglit test oes_matrix_get-api.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: "9.1 9.2" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 3e1fdf389918b3488f06116c1837594d469dbaa2)
-rw-r--r-- | src/mesa/main/extensions.c | 1 | ||||
-rw-r--r-- | src/mesa/main/get_hash_params.py | 5 | ||||
-rw-r--r-- | src/mesa/main/glheader.h | 6 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 4e46cf09552..b206c5b1f45 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -262,7 +262,6 @@ static const struct extension extension_table[] = { { "GL_OES_framebuffer_object", o(dummy_true), ES1, 2005 }, { "GL_OES_get_program_binary", o(dummy_true), ES2, 2008 }, { "GL_OES_mapbuffer", o(dummy_true), ES1 | ES2, 2005 }, - { "GL_OES_matrix_get", o(dummy_true), ES1, 2004 }, { "GL_OES_packed_depth_stencil", o(EXT_packed_depth_stencil), ES1 | ES2, 2007 }, { "GL_OES_point_size_array", o(dummy_true), ES1, 2004 }, { "GL_OES_point_sprite", o(ARB_point_sprite), ES1, 2004 }, diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index bd89ae5b340..b9000e67aa5 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -229,11 +229,6 @@ descriptor=[ { "apis": ["GLES"], "params": [ -# XXX: OES_matrix_get - [ "MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES", "" ], - [ "PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES", "" ], - [ "TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES", "" ], - # OES_point_size_array [ "POINT_SIZE_ARRAY_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled, TYPE_BOOLEAN)" ], [ "POINT_SIZE_ARRAY_TYPE_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM)" ], diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index b3b0c52a058..4ed51b3174b 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -115,12 +115,6 @@ typedef void *GLeglImageOES; #define GL_PALETTE8_RGB5_A1_OES 0x8B99 #endif -#ifndef GL_OES_matrix_get -#define GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES 0x898D -#define GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES 0x898E -#define GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES 0x898F -#endif - #ifndef GL_ES_VERSION_2_0 #define GL_SHADER_BINARY_FORMATS 0x8DF8 #define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 |