From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Aug 2011 00:18:00 +0000 (-0700)
Subject: mesa: Remove OES_read_format extension enable flag
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=425284e88244e63a627b3fc4ae4514f064c71a83;p=mesa.git

mesa: Remove OES_read_format extension enable flag

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.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
---

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index ba4919304a9..948027577a3 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 },
@@ -354,7 +354,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 3877b7167fa..99ce567cc2e 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 a2095dc9f22..866ec0a619a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2884,7 +2884,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;