Mesa (main): zink: pass current program's shader array, not ctx array

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Aug 27 02:50:21 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Thu Jun 10 08:17:33 2021 -0400

zink: pass current program's shader array, not ctx array

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

---

 src/gallium/drivers/zink/zink_program.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index b49f84a196f..470a3a4fb85 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -203,7 +203,7 @@ get_shader_module_for_stage(struct zink_context *ctx, struct zink_shader *zs, st
    uint32_t hash;
    unsigned base_size = 0;
 
-   shader_key_vtbl[stage](ctx, zs, ctx->gfx_stages, &key);
+   shader_key_vtbl[stage](ctx, zs, prog->shaders, &key);
    /* this is default variant if there is no default or it matches the default */
    if (prog->default_variant_key[pstage]) {
       const struct keybox *tmp = prog->default_variant_key[pstage];



More information about the mesa-commit mailing list