fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 00:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

tu: Fix D16 depth clear rounding mismatch in sysmem mode
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Different HW units (R2D blit engine, 3D pipeline, etc.) apply subtly
different F32->UNORM16 rounding to the same float clear value, causing
cleared pixels to fail subsequent depth comparisons.

Pre-quantize D16 clear values to exact UNORM16 precision before passing
to any HW path. The GMEM path is unaffected as it already converts to
integer in pack_blit_event_clear_value().

Fixes dEQP-EGL.functional.image.modify.renderbuffer_depth16_renderbuffer_clear_depth
with zink and ANGLE when sysmem is used.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41196>
This commit is contained in:
Valentine Burley 2026-04-27 11:11:22 +02:00 • committed by Marge Bot
parent 599a52174b
commit 7f6cd7f9aa
2 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/freedreno/vulkan/tu_clear_blit.cc
View file

@ -34,6 +34,15 @@ tu_pack_float32_for_unorm(float val, int bits)
return _mesa_lroundevenf(CLAMP(val, 0.0f, 1.0f) * (float) ((1 << bits) - 1));
}
/* Quantize a float to exact UNORMn precision to avoid F32->UNORMn rounding
* mismatches between different HW paths (R2D blit engine, 3D pipeline, etc).
*/
static float
tu_quantize_float_for_unorm(float val, int bits)
{
return (float) tu_pack_float32_for_unorm(val, bits) / (float) ((1 << bits) - 1);
}
/* r2d_ = BLIT_OP_SCALE operations */
static enum a6xx_2d_ifmt
@ -183,6 +192,8 @@ r2d_clear_value(struct tu_cmd_buffer *cmd,
clear_value[3] = val->depthStencil.stencil;
break;
case PIPE_FORMAT_Z16_UNORM:
clear_value[0] = fui(tu_quantize_float_for_unorm(val->depthStencil.depth, 16));
break;
case PIPE_FORMAT_Z32_FLOAT:
/* R2D_FLOAT32 */
clear_value[0] = fui(val->depthStencil.depth);
@ -1160,6 +1171,11 @@ r3d_clear_value(struct tu_cmd_buffer *cmd, struct tu_cs *cs, enum pipe_format fo
coords[3] = fui((val->depthStencil.stencil & 0xff) / 255.0f);
} break;
case PIPE_FORMAT_Z16_UNORM:
coords[0] = fui(tu_quantize_float_for_unorm(val->depthStencil.depth, 16));
coords[1] = 0;
coords[2] = 0;
coords[3] = 0;
break;
case PIPE_FORMAT_Z32_FLOAT:
coords[0] = fui(val->depthStencil.depth);
coords[1] = 0;
@ -4337,6 +4353,8 @@ tu_clear_sysmem_attachments(struct tu_cmd_buffer *cmd,
if (attachments[i].aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) {
z_clear = true;
z_clear_val = attachments[i].clearValue.depthStencil.depth;
if (cmd->state.pass->attachments[a].format == VK_FORMAT_D16_UNORM)
z_clear_val = tu_quantize_float_for_unorm(z_clear_val, 16);
}
if (attachments[i].aspectMask & VK_IMAGE_ASPECT_STENCIL_BIT) {

4
src/gallium/drivers/zink/ci/zink-tu-a618-fails.txt
View file

@ -29,7 +29,3 @@ wayland-dEQP-EGL.functional.resize.surface_size.grow,Fail
wayland-dEQP-EGL.functional.resize.surface_size.shrink,Fail
wayland-dEQP-EGL.functional.resize.surface_size.stretch_height,Fail
wayland-dEQP-EGL.functional.resize.surface_size.stretch_width,Fail
# Turnip-specific failures
x11-dEQP-EGL.functional.image.modify.renderbuffer_depth16_renderbuffer_clear_depth,Fail
wayland-dEQP-EGL.functional.image.modify.renderbuffer_depth16_renderbuffer_clear_depth,Fail