From: Ian Romanick <ian.d.roman...@intel.com>
This extension is always enabled, and drivers do not have
to option to disable it.
I kept this one separate from the others because I was a little
uncertain about the changes to get.c.
Cc: Kristian Høgsberg <k...@bitplanet.net>
---
src/mesa/main/extensions.c | 3 +--
src/mesa/main/get.c | 10 ++--------
src/mesa/main/mtypes.h | 1 -
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f0a7569..069fce6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -239,7 +239,7 @@ static const struct extension extension_table[] = {
{ "GL_OES_point_size_array", o(dummy_true),
ES1, 2004 },
{ "GL_OES_point_sprite", o(ARB_point_sprite),
ES1, 2004 },
{ "GL_OES_query_matrix", o(dummy_true),
ES1, 2003 },
- { "GL_OES_read_format", o(OES_read_format),
GL | ES1, 2003 },
+ { "GL_OES_read_format", o(dummy_true),
GL | ES1, 2003 },
{ "GL_OES_rgb8_rgba8", o(EXT_framebuffer_object),
ES1 | ES2, 2005 },
{ "GL_OES_single_precision", o(dummy_true),
ES1, 2003 },
{ "GL_OES_standard_derivatives",
o(OES_standard_derivatives), ES2, 2005 },
@@ -355,7 +355,6 @@ static const size_t default_extensions[] = {
o(EXT_separate_specular_color),
o(EXT_texture3D),
- o(OES_read_format),
o(OES_standard_derivatives),
/* Vendor Extensions */
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 1f66571..736c376 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -250,12 +250,6 @@ static const int extra_flush_current[] = {
EXTRA_END
};
-static const int extra_new_buffers_OES_read_format[] = {
- EXTRA_NEW_BUFFERS,
- EXT(OES_read_format),
- EXTRA_END
-};
-
static const int extra_EXT_secondary_color_flush_current[] = {
EXT(EXT_secondary_color),
EXTRA_FLUSH_CURRENT,
@@ -486,9 +480,9 @@ static const struct value_desc values[] = {
/* GL_OES_read_format */
{ GL_IMPLEMENTATION_COLOR_READ_TYPE_OES, LOC_CUSTOM, TYPE_INT, 0,
- extra_new_buffers_OES_read_format },
+ extra_new_buffers },
{ GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES, LOC_CUSTOM, TYPE_INT, 0,
- extra_new_buffers_OES_read_format },
+ extra_new_buffers },
/* GL_EXT_framebuffer_object */
{ GL_FRAMEBUFFER_BINDING_EXT, BUFFER_INT(Name),
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 860910d..7b81616 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2901,7 +2901,6 @@ struct gl_extensions
GLboolean NV_texture_rectangle;
GLboolean NV_vertex_program;
GLboolean NV_vertex_program1_1;
- GLboolean OES_read_format;
GLboolean SGIS_texture_lod;
GLboolean TDFX_texture_compression_FXT1;
GLboolean S3_s3tc;
--
1.7.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
