Mesa (main): zink: break out pipeline dynamic state2 into struct

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue May 31 15:23:38 2022 -0400

zink: break out pipeline dynamic state2 into struct

easier to expand

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16838>

---

 src/gallium/drivers/zink/zink_pipeline.h | 10 ++++++----
 src/gallium/drivers/zink/zink_program.c  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_pipeline.h b/src/gallium/drivers/zink/zink_pipeline.h
index 28fee65de47..f4a54203fb7 100644
--- a/src/gallium/drivers/zink/zink_pipeline.h
+++ b/src/gallium/drivers/zink/zink_pipeline.h
@@ -46,6 +46,11 @@ struct zink_pipeline_dynamic_state1 {
    struct zink_depth_stencil_alpha_hw_state *depth_stencil_alpha_state; //must be last
 };
 
+struct zink_pipeline_dynamic_state2 {
+   bool primitive_restart;
+   bool rasterizer_discard;
+};
+
 struct zink_gfx_pipeline_state {
    uint32_t rast_state : ZINK_RAST_HW_STATE_SIZE; //zink_rasterizer_hw_state
    uint32_t vertices_per_patch:5;
@@ -63,10 +68,7 @@ struct zink_gfx_pipeline_state {
 
    struct zink_pipeline_dynamic_state1 dyn_state1;
 
-   struct {
-      bool primitive_restart;
-      bool rasterizer_discard;
-   } dyn_state2;
+   struct zink_pipeline_dynamic_state2 dyn_state2;
 
    VkShaderModule modules[PIPE_SHADER_TYPES - 1];
    bool modules_changed;
diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 8cdf3a28869..39bdb71fdc4 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -268,7 +268,7 @@ equals_gfx_pipeline_state(const void *a, const void *b)
          return false;
    }
    if (!sa->have_EXT_extended_dynamic_state2) {
-      if (sa->dyn_state2.primitive_restart != sb->dyn_state2.primitive_restart)
+      if (memcmp(&sa->dyn_state2, &sb->dyn_state2, sizeof(sa->dyn_state2)))
          return false;
    }
    return !memcmp(sa->modules, sb->modules, sizeof(sa->modules)) &&