Module: Mesa Branch: main Commit: e7b03fa3dcb9545cda9da4b852ca7c0db1923a31 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7b03fa3dcb9545cda9da4b852ca7c0db1923a31
Author: antonino <[email protected]> Date: Fri Apr 28 11:36:08 2023 +0200 Revert "zink: add to multisample field to `zink_gfx_pipeline_state`" This reverts commit 14d58926099fb735312705f0853785dcd1888c2e. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22753> --- src/gallium/drivers/zink/zink_state.c | 1 - src/gallium/drivers/zink/zink_types.h | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/zink/zink_state.c b/src/gallium/drivers/zink/zink_state.c index bebdd22ab27..d702c089ea3 100644 --- a/src/gallium/drivers/zink/zink_state.c +++ b/src/gallium/drivers/zink/zink_state.c @@ -659,7 +659,6 @@ zink_bind_rasterizer_state(struct pipe_context *pctx, void *cso) bool half_pixel_center = ctx->rast_state ? ctx->rast_state->base.half_pixel_center : true; float line_width = ctx->rast_state ? ctx->rast_state->base.line_width : 1.0; ctx->rast_state = cso; - ctx->gfx_pipeline_state.multisample = !ctx->rast_state || ctx->rast_state->base.multisample; if (ctx->rast_state) { if (screen->info.have_EXT_provoking_vertex && diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index ebf2a769947..c1143146ec1 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -822,8 +822,7 @@ struct zink_gfx_pipeline_state { /* order matches zink_gfx_output_key */ unsigned force_persample_interp:1; uint32_t rast_samples:6; - uint32_t multisample: 1; - uint32_t min_samples:5; + uint32_t min_samples:6; uint32_t feedback_loop : 1; uint32_t feedback_loop_zs : 1; uint32_t rast_attachment_order : 1; @@ -999,8 +998,7 @@ struct zink_gfx_output_key { struct { unsigned force_persample_interp:1; uint32_t rast_samples:6; - uint32_t multisample: 1; - uint32_t min_samples:5; + uint32_t min_samples:6; uint32_t feedback_loop : 1; uint32_t feedback_loop_zs : 1; uint32_t rast_attachment_order : 1;
