Revert "mesa: add GL_EXT_texture_rg extension for OpenGL ES 2.x."

This reverts commit d1665388ce53d23ee7853e5083ce6f7192061109.

diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index ad83d9142d1cbc7051b915a1d87c120516a8be08..b26cac54b792dc4658be1395605b4ff2e48d44ac 100644 (file)
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -634,12 +634,4 @@
     </function>
 </category>
 
-<!-- 103. GL_EXT_texture_rg -->
-<category name="GL_EXT_texture_rg" number="103">
-    <enum name="RED_EXT"                                  value="0x1903"/>
-    <enum name="RG_EXT"                                   value="0x8227"/>
-    <enum name="R8_EXT"                                   value="0x8229"/>
-    <enum name="RG8_EXT"                                  value="0x822B"/>
-</category>
-
 </OpenGLAPI>

diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index b6cf52d074a778f0bba8e64ef2a59226960c4ed8..f870cf7db6449edf1a509190cd11238ee0a56486 100644 (file)
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -4150,7 +4150,6 @@
        <category name="OES_packed_depth_stencil"/>
        <category name="OES_standard_derivatives"/>
        <category name="EXT_texture_format_BGRA8888"/>
-       <category name="EXT_texture_rg"/>
        <category name="EXT_read_format_bgra"/>
 
        <category name="EXT_texture_compression_dxt1"/>

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 793cc4e24e06bcf04dc1d5a40ca45d7d20cf999e..e4fe73307ad6372998bab17e47fdf5f87cc2a61a 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -200,7 +200,6 @@ static const struct extension extension_table[] = {
    { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },
    { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },
    { "GL_EXT_texture_format_BGRA8888",             o(dummy_true),                                   ES1 | ES2, 2005 },
-   { "GL_EXT_texture_rg",                          o(ARB_texture_rg),                                     ES2, 2011 },
    { "GL_EXT_read_format_bgra",                    o(dummy_true),                                   ES1 | ES2, 2009 },
    { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },
    { "GL_EXT_texture_lod_bias",                    o(dummy_true),                              GL | ES1,       1999 },