Module: Mesa Branch: staging/23.0 Commit: d461dd2f233dc300c83bbdea31d335bed2613d9a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d461dd2f233dc300c83bbdea31d335bed2613d9a
Author: SoroushIMG <[email protected]> Date: Fri Mar 10 16:24:46 2023 +0000 zink: fix stale point sprite mode state Fixes: cf8ca77be10 ("zink: handle point sprite") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21840> (cherry picked from commit 5903868f9919db6b929effa665b5a273604fa27d) stable: - mark spec@arb_point_sprite@arb_point_sprite-checkerboard as pass --- .pick_status.json | 2 +- src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 1 - src/gallium/drivers/zink/zink_state.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6e1981c7e54..5183d7037ea 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -13914,7 +13914,7 @@ "description": "zink: fix stale point sprite mode state", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "cf8ca77be10772e96d44e6c3274b0fb94868abc4", "notes": null diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt index 54d5bbc7e08..9e3e5952594 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt @@ -94,7 +94,6 @@ spec@!opengl 2.1@polygon-stipple-fs,Fail spec@arb_depth_texture@depth-tex-modes,Fail spec@arb_gpu_shader_fp64@execution@arb_gpu_shader_fp64-tf-separate,Fail spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-frag,Fail -spec@arb_point_sprite@arb_point_sprite-checkerboard,Fail spec@arb_point_sprite@arb_point_sprite-mipmap,Fail spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail spec@arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT,Fail diff --git a/src/gallium/drivers/zink/zink_state.c b/src/gallium/drivers/zink/zink_state.c index b4512ea7cef..2b80643291a 100644 --- a/src/gallium/drivers/zink/zink_state.c +++ b/src/gallium/drivers/zink/zink_state.c @@ -678,7 +678,8 @@ zink_bind_rasterizer_state(struct pipe_context *pctx, void *cso) else if (rasterizer_discard != ctx->rast_state->base.rasterizer_discard) zink_set_color_write_enables(ctx); - if (ctx->rast_state->base.point_quad_rasterization != point_quad_rasterization) + if (ctx->rast_state->base.point_quad_rasterization || + ctx->rast_state->base.point_quad_rasterization != point_quad_rasterization) zink_set_fs_point_coord_key(ctx); if (ctx->rast_state->base.scissor != scissor) ctx->scissor_changed = true;
