Module: Mesa
Branch: master
Commit: 5be700e5cc7c391ed197e46d2928856761409e8b
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5be700e5cc7c391ed197e46d2928856761409e8b
Author: Ian Romanick <ian.d.roman...@intel.com>
Date: Tue Nov 10 15:18:54 2015 -0800
meta: Unconditionally set GL_SKIP_DECODE_EXT
The path that depends on this will be avoided (by fallback_required) if
the extension is not supported. _mesa_set_sampler_srgb_decode does not
generate GL errors (by design), so there are no problems there.
I kept this change separate and last because it is one of the few in the
series that is not a candidate for the stable branch.
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstr...@intel.com>
---
src/mesa/drivers/common/meta.c | 6 ++----
src/mesa/drivers/common/meta_generate_mipmap.c | 9 ++-------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index b026e47..1ed0e4d 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -3132,10 +3132,8 @@ decompress_texture_image(struct gl_context *ctx,
/* nearest filtering */
_mesa_set_sampler_filters(ctx, decompress->samp_obj, GL_NEAREST,
GL_NEAREST);
- /* No sRGB decode or encode.*/
- if (ctx->Extensions.EXT_texture_sRGB_decode) {
- _mesa_set_sampler_srgb_decode(ctx, decompress->samp_obj,
GL_SKIP_DECODE_EXT);
- }
+ /* We don't want to encode or decode sRGB values; treat them as linear.
*/
+ _mesa_set_sampler_srgb_decode(ctx, decompress->samp_obj,
GL_SKIP_DECODE_EXT);
}
_mesa_bind_sampler(ctx, ctx->Texture.CurrentUnit, decompress->samp_obj);
diff --git a/src/mesa/drivers/common/meta_generate_mipmap.c
b/src/mesa/drivers/common/meta_generate_mipmap.c
index 7beae5f..f20fcac 100644
--- a/src/mesa/drivers/common/meta_generate_mipmap.c
+++ b/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -239,13 +239,8 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum
target,
_mesa_set_sampler_wrap(ctx, mipmap->samp_obj, GL_CLAMP_TO_EDGE,
GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
- /* We don't want to encode or decode sRGB values; treat them as linear.
- * This is not technically correct for GLES3 but we don't get any API
- * error at the moment.
- */
- if (ctx->Extensions.EXT_texture_sRGB_decode) {
- _mesa_set_sampler_srgb_decode(ctx, mipmap->samp_obj,
GL_SKIP_DECODE_EXT);
- }
+ /* We don't want to encode or decode sRGB values; treat them as linear.
*/
+ _mesa_set_sampler_srgb_decode(ctx, mipmap->samp_obj, GL_SKIP_DECODE_EXT);
}
_mesa_bind_sampler(ctx, ctx->Texture.CurrentUnit, mipmap->samp_obj);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
