From: Ilia Mirkin Date: Sat, 20 Feb 2016 20:58:19 +0000 (-0500) Subject: mesa: expose GL_EXT_texture_sRGB_decode on GLES 3.0+ X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2875183463420ba21418d546f844f5bf1f089214;p=mesa.git mesa: expose GL_EXT_texture_sRGB_decode on GLES 3.0+ Could be exposed on earlier GLES versions if we supported EXT_sRGB, but we don't, for now. Signed-off-by: Ilia Mirkin Reviewed-by: Samuel Iglesias Gonsálvez --- diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 68f36178f32..5fa61b93326 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -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 , 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) diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 20770a77e15..3b769f436b7 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -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))