mesa: expose GL_EXT_texture_sRGB_decode on GLES 3.0+
authorIlia Mirkin <imirkin@alum.mit.edu>
Sat, 20 Feb 2016 20:58:19 +0000 (15:58 -0500)
committerIlia Mirkin <imirkin@alum.mit.edu>
Sat, 27 Feb 2016 04:55:45 +0000 (23:55 -0500)
Could be exposed on earlier GLES versions if we supported EXT_sRGB, but
we don't, for now.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
src/mesa/main/extensions_table.h
src/mesa/main/texparam.c

index 68f36178f32d710ca1ebb0497e7712909ef8dbdd..5fa61b933260128b479ee1c1582b4a053db736e4 100644 (file)
@@ -243,7 +243,7 @@ EXT(EXT_texture_object                      , dummy_true
 EXT(EXT_texture_rectangle                   , NV_texture_rectangle                   , GLL,  x ,  x ,  x , 2004)
 EXT(EXT_texture_rg                          , ARB_texture_rg                         ,  x ,  x ,  x , ES2, 2011)
 EXT(EXT_texture_sRGB                        , EXT_texture_sRGB                       , GLL, GLC,  x ,  x , 2004)
-EXT(EXT_texture_sRGB_decode                 , EXT_texture_sRGB_decode                , GLL, GLC,  x ,  , 2006)
+EXT(EXT_texture_sRGB_decode                 , EXT_texture_sRGB_decode                , GLL, GLC,  x ,  30, 2006)
 EXT(EXT_texture_shared_exponent             , EXT_texture_shared_exponent            , GLL, GLC,  x ,  x , 2004)
 EXT(EXT_texture_snorm                       , EXT_texture_snorm                      , GLL, GLC,  x ,  x , 2009)
 EXT(EXT_texture_swizzle                     , EXT_texture_swizzle                    , GLL, GLC,  x ,  x , 2008)
index 20770a77e15c4af9680a477312929463526f0e6e..3b769f436b744750b27c992b8ebe983752a62605 100644 (file)
@@ -568,8 +568,7 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_TEXTURE_SRGB_DECODE_EXT:
-      if (_mesa_is_desktop_gl(ctx)
-          && ctx->Extensions.EXT_texture_sRGB_decode) {
+      if (ctx->Extensions.EXT_texture_sRGB_decode) {
          GLenum decode = params[0];
 
          if (!target_allows_setting_sampler_parameters(texObj->Target))