mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-12-12 19:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mesa: disable snorm readpix clamping with EXT_render_snorm

Browse Source 
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25054>
This commit is contained in:
Tapani Pälli 2023-09-03 20:09:31 +03:00 committed by Marge Bot
parent 285223d0fd
commit 6e4663635f
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesa/main/readpix.c
View File

@ -106,10 +106,19 @@ _mesa_get_readpixels_transfer_ops(const struct gl_context *ctx,
return 0; 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) { if (uses_blit) {
/* For blit-based ReadPixels packing, the clamping is done automatically /* 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) && if (_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) &&
!gles_snorm &&
(type == GL_FLOAT || type == GL_HALF_FLOAT || (type == GL_FLOAT || type == GL_HALF_FLOAT ||
type == GL_UNSIGNED_INT_10F_11F_11F_REV)) { type == GL_UNSIGNED_INT_10F_11F_11F_REV)) {
transferOps |= IMAGE_CLAMP_BIT; transferOps |= IMAGE_CLAMP_BIT;
@ -117,15 +126,19 @@ _mesa_get_readpixels_transfer_ops(const struct gl_context *ctx,
} }
else { else {
/* For CPU-based ReadPixels packing, the clamping must always be done /* For CPU-based ReadPixels packing, the clamping must always be done
* for non-float types, */ * for non-float types, except on ES when using snorm types.
if (_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) || */
if ((_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) ||
(type != GL_FLOAT && type != GL_HALF_FLOAT && (type != GL_FLOAT && type != GL_HALF_FLOAT &&
type != GL_UNSIGNED_INT_10F_11F_11F_REV)) { type != GL_UNSIGNED_INT_10F_11F_11F_REV)) && !gles_snorm) {
transferOps |= IMAGE_CLAMP_BIT; 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) && if (!_mesa_get_clamp_read_color(ctx, ctx->ReadBuffer) &&
!gles_snorm &&
_mesa_get_format_datatype(texFormat) == GL_SIGNED_NORMALIZED && _mesa_get_format_datatype(texFormat) == GL_SIGNED_NORMALIZED &&
(type == GL_BYTE || type == GL_SHORT || type == GL_INT)) { (type == GL_BYTE || type == GL_SHORT || type == GL_INT)) {
transferOps &= ~IMAGE_CLAMP_BIT; transferOps &= ~IMAGE_CLAMP_BIT;