Revert "zink: add `single_sample` to fs key"

This reverts commit 420f2c0878f0c38128854f2adbbeb1391e752cb8.

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

diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp
index 3ddb096..a3d7cb5 100644 (file)
--- a/src/gallium/drivers/zink/zink_draw.cpp
+++ b/src/gallium/drivers/zink/zink_draw.cpp
@@ -513,8 +513,6 @@ zink_draw(struct pipe_context *pctx,
       zink_set_primitive_emulation_keys(ctx);
    }
 
-   zink_update_fs_key_single_sample(ctx);
-
    if (index_size) {
       const VkIndexType index_type[3] = {
          VK_INDEX_TYPE_UINT8_EXT,

diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 011e943..0e5fee2 100644 (file)
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -2454,12 +2454,3 @@ zink_set_primitive_emulation_keys(struct zink_context *ctx)
               ctx->gfx_stages[MESA_SHADER_GEOMETRY]->non_fs.is_generated)
          ctx->base.bind_gs_state(&ctx->base, NULL);
 }
-
-void
-zink_update_fs_key_single_sample(struct zink_context *ctx)
-{
-   bool single_sample = ctx->rast_state && !ctx->rast_state->base.multisample &&
-                        ctx->gfx_pipeline_state.rast_samples != 0;
-   if (zink_get_fs_base_key(ctx)->single_sample != single_sample)
-      zink_set_fs_base_key(ctx)->single_sample = single_sample;
-}

diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h
index 459b1ee..bf78d19 100644 (file)
--- a/src/gallium/drivers/zink/zink_program.h
+++ b/src/gallium/drivers/zink/zink_program.h
@@ -316,9 +316,6 @@ void
 zink_update_fs_key_samples(struct zink_context *ctx);
 
 void
-zink_update_fs_key_single_sample(struct zink_context *ctx);
-
-void
 zink_update_gs_key_rectangular_line(struct zink_context *ctx);
 
 static inline struct zink_vs_key *

diff --git a/src/gallium/drivers/zink/zink_shader_keys.h b/src/gallium/drivers/zink/zink_shader_keys.h
index 79305c3..c7e0615 100644 (file)
--- a/src/gallium/drivers/zink/zink_shader_keys.h
+++ b/src/gallium/drivers/zink/zink_shader_keys.h
@@ -85,8 +85,7 @@ struct zink_fs_key_base {
    bool force_persample_interp : 1;
    bool fbfetch_ms : 1;
    bool shadow_needs_shader_swizzle : 1; //append zink_zs_swizzle_key after the key data
-   bool single_sample: 1;
-   uint8_t pad : 1;
+   uint8_t pad : 2;
    uint8_t coord_replace_bits;
 };