Mesa (main): zink: flag shader modules as default

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Jul 7 03:30:53 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri May 14 18:17:23 2021 -0400

zink: flag shader modules as default

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

---

 src/gallium/drivers/zink/zink_program.c | 1 +
 src/gallium/drivers/zink/zink_program.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index 798b53488e6..52d85f987d6 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -250,6 +250,7 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_shader *zs, st
       if (key.is_default_variant) {
          /* previously returned */
          *default_zm = zm;
+         zm->default_variant = true;
          prog->default_variant_key[pstage] = keybox;
       }
    }
diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h
index 7548b45f213..a406002288b 100644
--- a/src/gallium/drivers/zink/zink_program.h
+++ b/src/gallium/drivers/zink/zink_program.h
@@ -65,6 +65,7 @@ struct zink_cs_push_constant {
  */
 struct zink_shader_module {
    VkShaderModule shader;
+   bool default_variant;
 };
 
 struct zink_program {



More information about the mesa-commit mailing list