Mesa (main): zink: also flag sample_locations_changed if framebuffer samples changes

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jun 9 17:40:57 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Apr  2 17:34:49 2021 -0400

zink: also flag sample_locations_changed if framebuffer samples changes

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11189>

---

 src/gallium/drivers/zink/zink_context.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 5cd34ace8a1..274839c67fc 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -1895,8 +1895,10 @@ zink_set_framebuffer_state(struct pipe_context *pctx,
    /* in vulkan, gl_SampleMask needs to be explicitly ignored for sampleCount == 1 */
    if ((ctx->gfx_pipeline_state.rast_samples > 1) != (rast_samples > 1))
       ctx->dirty_shader_stages |= 1 << PIPE_SHADER_FRAGMENT;
-   if (ctx->gfx_pipeline_state.rast_samples != rast_samples)
+   if (ctx->gfx_pipeline_state.rast_samples != rast_samples) {
+      ctx->sample_locations_changed |= ctx->gfx_pipeline_state.sample_locations_enabled;
       ctx->gfx_pipeline_state.dirty = true;
+   }
    ctx->gfx_pipeline_state.rast_samples = rast_samples;
    if (ctx->gfx_pipeline_state.num_attachments != state->nr_cbufs)
       ctx->gfx_pipeline_state.dirty = true;



More information about the mesa-commit mailing list