Mesa (9.1): mesa: Remove all traces of GL_OES_matrix_get
Carl Worth
cworth at kemper.freedesktop.org
Thu Oct 3 05:00:11 UTC 2013
Module: Mesa
Branch: 9.1
Commit: c6d5d39147c39833480fb644a56e6e38cd1d9335
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6d5d39147c39833480fb644a56e6e38cd1d9335
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Sep 13 11:31:00 2013 -0500
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 at intel.com>
Cc: "9.1 9.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 3e1fdf389918b3488f06116c1837594d469dbaa2)
---
src/mesa/main/extensions.c | 1 -
src/mesa/main/get_hash_params.py | 5 -----
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 a827832..bb2482f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -257,7 +257,6 @@ static const struct extension extension_table[] = {
{ "GL_OES_framebuffer_object", o(EXT_framebuffer_object), ES1, 2005 },
{ "GL_OES_get_program_binary", o(ARB_shader_objects), 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 451d870..bc710ec 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 e93ca30..8c25899 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -119,12 +119,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
More information about the mesa-commit
mailing list