Mesa (main): zink: scale depth bias by factor of 2

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d0f15304a3fbd09fee114ca15f081e5718b716c8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d0f15304a3fbd09fee114ca15f081e5718b716c8

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Apr 27 10:11:37 2022 -0400

zink: scale depth bias by factor of 2

this is enough to fix CTS

affects/fixes:
dEQP-GLES3.functional.polygon_offset.default_render_with_units
dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units
dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16195>

---

 src/gallium/drivers/zink/ci/zink-anv-icl-fails.txt | 3 ---
 src/gallium/drivers/zink/ci/zink-radv-fails.txt    | 1 -
 src/gallium/drivers/zink/zink_state.c              | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/zink-anv-icl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-icl-fails.txt
index 036e06c0bed..6ab465a17eb 100644
--- a/src/gallium/drivers/zink/ci/zink-anv-icl-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-icl-fails.txt
@@ -17,9 +17,6 @@ dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide,Fail
 dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide,Fail
 dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide,Fail
 dEQP-GLES2.functional.rasterization.primitives.line_loop_wide,Fail
-dEQP-GLES3.functional.polygon_offset.default_render_with_units,Fail
-dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units,Fail
-dEQP-GLES3.functional.polygon_offset.fixed24_render_with_units,Fail
 dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.interpolation.lines_wide,Fail
 dEQP-GLES3.functional.rasterization.fbo.texture_2d.interpolation.lines_wide,Fail
 dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide,Fail
diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt
index fe90384874d..b455fed59eb 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt
@@ -173,7 +173,6 @@ dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth24_stencil8,Fail
 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8,Fail
 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component24,Fail
 dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f,Fail
-dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units,Fail
 dEQP-GLES3.functional.rasterization.primitives.line_loop_wide,Fail
 dEQP-GLES3.functional.rasterization.primitives.line_strip_wide,Fail
 dEQP-GLES3.functional.shaders.metamorphic.bubblesort_flag.variant_1,Fail
diff --git a/src/gallium/drivers/zink/zink_state.c b/src/gallium/drivers/zink/zink_state.c
index 802389985cf..f1bd120bb85 100644
--- a/src/gallium/drivers/zink/zink_state.c
+++ b/src/gallium/drivers/zink/zink_state.c
@@ -611,7 +611,7 @@ zink_create_rasterizer_state(struct pipe_context *pctx,
    state->offset_point = rs_state->offset_point;
    state->offset_line = rs_state->offset_line;
    state->offset_tri = rs_state->offset_tri;
-   state->offset_units = rs_state->offset_units;
+   state->offset_units = rs_state->offset_units * 2;
    state->offset_clamp = rs_state->offset_clamp;
    state->offset_scale = rs_state->offset_scale;