From c907dce67ae5cbd00a977542da24ba4d40e61094 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Fri, 19 Jun 2026 11:20:41 +0200 Subject: [PATCH] zink: Also enable the nearest consistency workaround on turnip. Part-of: --- src/freedreno/ci/traces-freedreno.yml | 2 +- .../drivers/zink/ci/zink-tu-a618-fails.txt | 18 ++++-------------- .../drivers/zink/ci/zink-tu-a750-fails.txt | 14 -------------- src/gallium/drivers/zink/zink_screen.c | 3 +++ 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml index 7f4cdb4770b..b47642b4c7f 100644 --- a/src/freedreno/ci/traces-freedreno.yml +++ b/src/freedreno/ci/traces-freedreno.yml @@ -44,7 +44,7 @@ traces: freedreno-a618: checksum: e0e18dcc50ab2e23cead650d64469178 zink-a618: - checksum: b7e0cdb0db74ea9a31fb7a75ae0d76fc + checksum: b007c69ad3d9ede36bac6b2fe356722b valve/counterstrike-source-v2.trace: freedreno-a306: diff --git a/src/gallium/drivers/zink/ci/zink-tu-a618-fails.txt b/src/gallium/drivers/zink/ci/zink-tu-a618-fails.txt index 89692af2c38..fb2102c555c 100644 --- a/src/gallium/drivers/zink/ci/zink-tu-a618-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-tu-a618-fails.txt @@ -2,22 +2,12 @@ spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail spec@ext_transform_feedback@tessellation quads wireframe,Fail +# Regression from nearest_consistency fixes. Since this doesn't show up on 750, +# assuming it's the 16-bit color UBWC problem. +dEQP-GLES3.functional.fbo.msaa.4_samples.r16f,Fail + dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.lowp_mat4_float_vertex,Fail dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.mediump_mat4_float_vertex,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag,Fail # Autotune regression dEQP-GLES3.functional.multisample.fbo_4_samples.stencil,Fail diff --git a/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt b/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt index eeca6dfe50c..f84d00ddf22 100644 --- a/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt @@ -1,18 +1,4 @@ GTF-GL46.gtf40.GL3Tests.transform_feedback2.transform_feedback2_two_buffers,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_mag_reverse_src_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_dst_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_dst_y,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_x,Fail -dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_out_of_bounds_min_reverse_src_y,Fail # Autotune regression dEQP-GLES3.functional.multisample.fbo_4_samples.stencil,Fail diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 7aea90f95bd..9747243cfd4 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -3133,6 +3133,9 @@ init_driver_workarounds(struct zink_screen *screen) /* Interpolation is not consistent between two triangles of a rectangle. */ screen->driver_workarounds.inconsistent_interpolation = true; break; + case VK_DRIVER_ID_MESA_TURNIP: + screen->driver_workarounds.inconsistent_interpolation = true; + break; default: break; }