Module: Mesa Branch: main Commit: 6e4663635f6df58f954f1c90391332b2795d1a85 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e4663635f6df58f954f1c90391332b2795d1a85
Author: Tapani Pälli <tapani.pa...@intel.com> Date: Sun Sep 3 20:09:31 2023 +0300 mesa: disable snorm readpix clamping with EXT_render_snorm Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25054> --- src/mesa/main/readpix.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index d60159c266c..1ae2784fb20 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -106,10 +106,19 @@ _mesa_get_readpixels_transfer_ops(const struct gl_context *ctx, return 0; } + /* If on OpenGL ES with GL_EXT_render_snorm, negative values should + * not be clamped. + */ + bool gles_snorm = + _mesa_has_EXT_render_snorm(ctx) && + _mesa_get_format_datatype(texFormat) == GL_SIGNED_NORMALIZED; + if (uses_blit) { /* For blit-based ReadPixels packing, the clamping is done automatically - * unless the type is float. */ + * unless the type is float. Disable clamping when on ES using snorm. + */ if (_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) && + !gles_snorm && (type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_UNSIGNED_INT_10F_11F_11F_REV)) { transferOps |= IMAGE_CLAMP_BIT; @@ -117,15 +126,19 @@ _mesa_get_readpixels_transfer_ops(const struct gl_context *ctx, } else { /* For CPU-based ReadPixels packing, the clamping must always be done - * for non-float types, */ - if (_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) || - (type != GL_FLOAT && type != GL_HALF_FLOAT && - type != GL_UNSIGNED_INT_10F_11F_11F_REV)) { + * for non-float types, except on ES when using snorm types. + */ + if ((_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) || + (type != GL_FLOAT && type != GL_HALF_FLOAT && + type != GL_UNSIGNED_INT_10F_11F_11F_REV)) && !gles_snorm) { transferOps |= IMAGE_CLAMP_BIT; } - /* For SNORM formats we only clamp if `type` is signed and clamp is `true` */ + /* For SNORM formats we only clamp if `type` is signed and clamp is `true` + * and when not on ES using snorm types. + */ if (!_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) && + !gles_snorm && _mesa_get_format_datatype(texFormat) == GL_SIGNED_NORMALIZED && (type == GL_BYTE || type == GL_SHORT || type == GL_INT)) { transferOps &= ~IMAGE_CLAMP_BIT;
