mesa/es: Clean up extension string.

Add some new extensions and remove those that do not belong to
OpenGL ES 2.0.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>

diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c
index 548fb0f0297db3be45af0b43317632eeef9836a7..0ace2924b37d420087f065d8e6fd28794203e182 100644 (file)
--- a/src/mesa/es/main/specials_es1.c
+++ b/src/mesa/es/main/specials_es1.c
@@ -140,8 +140,16 @@ make_extension_string(const GLcontext *ctx, char *str)
    if (ctx->Extensions.EXT_texture_filter_anisotropic)
       len += append_extension(&str, "GL_EXT_texture_filter_anisotropic");
 
+   /* some applications check this for NPOT support */
    if (ctx->Extensions.ARB_texture_non_power_of_two)
       len += append_extension(&str, "GL_ARB_texture_non_power_of_two");
+
+   if (ctx->Extensions.EXT_texture_compression_s3tc)
+      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");
+   if (ctx->Extensions.EXT_texture_lod_bias)
+      len += append_extension(&str, "GL_EXT_texture_lod_bias");
+   if (ctx->Extensions.EXT_blend_minmax)
+      len += append_extension(&str, "GL_EXT_blend_minmax");
    if (ctx->Extensions.EXT_multi_draw_arrays)
       len += append_extension(&str, "GL_EXT_multi_draw_arrays");
 

diff --git a/src/mesa/es/main/specials_es2.c b/src/mesa/es/main/specials_es2.c
index ef8c5816187fd472750aee69318d17d3b76b9bf0..e11ade9b9480a4aa9081052923b6a3016939d187 100644 (file)
--- a/src/mesa/es/main/specials_es2.c
+++ b/src/mesa/es/main/specials_es2.c
@@ -86,21 +86,15 @@ make_extension_string(const GLcontext *ctx, char *str)
 {
    size_t len = 0;
 
-   /* Core additions */
-   len += append_extension(&str, "GL_OES_single_precision");
-
-   /* Required extensions */
    len += append_extension(&str, "GL_OES_compressed_paletted_texture");
 
    if (ctx->Extensions.ARB_framebuffer_object) {
-      len += append_extension(&str, "GL_OES_framebuffer_object");
       len += append_extension(&str, "GL_OES_depth24");
       len += append_extension(&str, "GL_OES_depth32");
       len += append_extension(&str, "GL_OES_fbo_render_mipmap");
       len += append_extension(&str, "GL_OES_rgb8_rgba8");
       len += append_extension(&str, "GL_OES_stencil1");
       len += append_extension(&str, "GL_OES_stencil4");
-      len += append_extension(&str, "GL_OES_stencil8");
    }
 
    if (ctx->Extensions.EXT_vertex_array)
@@ -123,6 +117,10 @@ make_extension_string(const GLcontext *ctx, char *str)
    if (ctx->Extensions.ARB_fragment_shader)
       len += append_extension(&str, "GL_OES_standard_derivatives");
 
+   if (ctx->Extensions.EXT_texture_compression_s3tc)
+      len += append_extension(&str, "GL_EXT_texture_compression_dxt1");
+   if (ctx->Extensions.EXT_blend_minmax)
+      len += append_extension(&str, "GL_EXT_blend_minmax");
    if (ctx->Extensions.EXT_multi_draw_arrays)
       len += append_extension(&str, "GL_EXT_multi_draw_arrays");