mesa: Change OES_standard_derivatives to be stand-alone extension

Add a bit in struct gl_extensions for OES_standard_derivatives, and enable
the bit by default. Advertise the extension only if the bit is enabled.

Previously, OES_standard_derivatives was advertised in GLES2 contexts
if ARB_framebuffer_object was enabled.

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 015f89aa0ba67653def7d029ca93bc9cf69a9f34..39aabdb752c1f569c2ab7f6cc1e2142b3c525da7 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -232,7 +232,7 @@ static const struct extension extension_table[] = {
    { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1       },
    { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2 },
    { "GL_OES_single_precision",                    o(dummy_true),                                   ES1       },
-   { "GL_OES_standard_derivatives",                o(ARB_fragment_shader),                                ES2 },
+   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2 },
    { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE                },
    { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE                },
    { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2 },
@@ -351,6 +351,7 @@ static const size_t default_extensions[] = {
    o(EXT_vertex_array),
 
    o(OES_read_format),
+   o(OES_standard_derivatives),
 
    /* Vendor Extensions */
    o(APPLE_packed_pixels),

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 3fc1facb4ca8a35516cd19ed7bc4b29c9fa39db1..8d2030e9cedf3a3c94c1a85254fbeb9eb89cab36 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2772,6 +2772,7 @@ struct gl_extensions
    GLboolean EXT_vertex_array;
    GLboolean EXT_vertex_array_bgra;
    GLboolean EXT_vertex_array_set;
+   GLboolean OES_standard_derivatives;
    /* vendor extensions */
    GLboolean APPLE_client_storage;
    GLboolean APPLE_packed_pixels;