From: antonino <antonino.maniscalco@collabora.com>
Date: Fri, 28 Apr 2023 09:35:27 +0000 (+0200)
Subject: Revert "zink: set when pipeline dirty flag when multisample changes"
X-Git-Tag: upstream/23.3.3~9286
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a8a397294cfbd019587a5de75ab8238c209bb5e;p=platform%2Fupstream%2Fmesa.git

Revert "zink: set when pipeline dirty flag when multisample changes"

This reverts commit 5969541123dbfe1ac339284911a83af712fdcc25.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22753>
---

diff --git a/src/gallium/drivers/zink/zink_state.c b/src/gallium/drivers/zink/zink_state.c
index 1853005..bebdd22 100644
--- a/src/gallium/drivers/zink/zink_state.c
+++ b/src/gallium/drivers/zink/zink_state.c
@@ -659,7 +659,7 @@ 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;
-   bool multisample = !ctx->rast_state || ctx->rast_state->base.multisample;
+   ctx->gfx_pipeline_state.multisample = !ctx->rast_state || ctx->rast_state->base.multisample;
 
    if (ctx->rast_state) {
       if (screen->info.have_EXT_provoking_vertex &&
@@ -711,10 +711,6 @@ zink_bind_rasterizer_state(struct pipe_context *pctx, void *cso)
          zink_set_fs_base_key(ctx)->force_persample_interp = ctx->rast_state->base.force_persample_interp;
          ctx->gfx_pipeline_state.dirty = true;
       }
-      if (ctx->gfx_pipeline_state.multisample != multisample) {
-         ctx->gfx_pipeline_state.multisample = multisample;
-         ctx->gfx_pipeline_state.dirty |= !screen->have_full_ds3;
-      }
       ctx->gfx_pipeline_state.force_persample_interp = ctx->rast_state->base.force_persample_interp;
 
       if (ctx->rast_state->base.half_pixel_center != half_pixel_center)