Module: Mesa Branch: main Commit: 4896e136b646c1af262942e695f66ba5615fe789 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4896e136b646c1af262942e695f66ba5615fe789
Author: Dave Airlie <[email protected]> Date: Wed May 25 13:28:43 2022 +1000 lavapipe: fix depth bias offset flag enables. When vulkan enables depth bias, enable it for all 3 prim types in gallium. This fixes: dEQP-VK.draw.renderpass.depth_bias.depth_bias_* and one zink test in CI Cc: mesa-stable Reviewed-by: Mike Blumenkrantz <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16701> --- src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 1 - src/gallium/frontends/lavapipe/lvp_execute.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt index 29ce6320c86..e8fd3b92704 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt @@ -156,7 +156,6 @@ spec@!opengl 1.1@linestipple@Factor 2x,Fail spec@!opengl 1.1@linestipple@Factor 3x,Fail spec@!opengl 1.1@linestipple@Line loop,Fail spec@!opengl 1.1@linestipple@Line strip,Fail -spec@!opengl 1.1@polygon-offset,Fail spec@!opengl 1.1@polygon-mode,Fail spec@!opengl 1.1@polygon-mode-facing,Fail spec@!opengl 1.1@polygon-mode-offset,Fail diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 8519ce29106..3983bda698c 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -329,8 +329,14 @@ static void emit_state(struct rendering_state *state) assert(offsetof(struct pipe_rasterizer_state, offset_clamp) - offsetof(struct pipe_rasterizer_state, offset_units) == sizeof(float) * 2); if (state->depth_bias.enabled) { memcpy(&state->rs_state.offset_units, &state->depth_bias, sizeof(float) * 3); + state->rs_state.offset_tri = true; + state->rs_state.offset_line = true; + state->rs_state.offset_point = true; } else { memset(&state->rs_state.offset_units, 0, sizeof(float) * 3); + state->rs_state.offset_tri = false; + state->rs_state.offset_line = false; + state->rs_state.offset_point = false; } cso_set_rasterizer(state->cso, &state->rs_state); state->rs_dirty = false;
