summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2023-02-06 15:57:45 -0500
committerEric Engestrom <eric@engestrom.ch>2023-02-08 20:34:46 +0000
commitbf586009b4dcb26159f454600123c3059ec6407b (patch)
tree075db594a7fa99bd26d6ce6751f9e97db3c7606b
parenta194c941ccf5bab228e468fbc23721c1399fe3e9 (diff)
downloadmesa-bf586009b4dcb26159f454600123c3059ec6407b.tar.gz
mesa-bf586009b4dcb26159f454600123c3059ec6407b.tar.bz2
mesa-bf586009b4dcb26159f454600123c3059ec6407b.zip
zink: add a define for the "default" optimal key
Reviewed-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21169> (cherry-picked from 1f08a6dcdbf382a7586b703379969bdd3113c02e)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/zink/zink_shader_keys.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 730c64b5c27..60f4ba90781 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -517,7 +517,7 @@
"description": "zink: add a define for the \"default\" optimal key",
"nominated": false,
"nomination_type": null,
- "resolution": 4,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/gallium/drivers/zink/zink_shader_keys.h b/src/gallium/drivers/zink/zink_shader_keys.h
index bf5444bd209..d49785be89d 100644
--- a/src/gallium/drivers/zink/zink_shader_keys.h
+++ b/src/gallium/drivers/zink/zink_shader_keys.h
@@ -107,6 +107,9 @@ union zink_shader_key_optimal {
uint32_t val;
};
+/* the default key has only last_vertex_stage set*/
+#define ZINK_SHADER_KEY_OPTIMAL_DEFAULT (1<<0)
+
static inline const struct zink_fs_key *
zink_fs_key(const struct zink_shader_key *key)
{