From 83737cca5c3f2f0ae8fff3ee791447869ab774b6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 15 Feb 2024 11:33:16 -0400 Subject: [PATCH] asahi: fix stage accounting for meta compute shaders Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/asahi/agx_state.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index 1be0ab9cb30..2b9c6613f67 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -1802,6 +1802,7 @@ agx_compile_nir(struct agx_device *dev, nir_shader *nir, memcpy(compiled->bo->ptr.cpu, binary.data, binary.size); } + compiled->stage = stage; util_dynarray_fini(&binary); return compiled; } @@ -2065,7 +2066,6 @@ agx_compile_variant(struct agx_device *dev, struct pipe_context *pctx, compiled->gs_count = agx_compile_nir(dev, gs_count, &base_key, debug, so->type); compiled->gs_count->so = so; - compiled->gs_count->stage = so->type; } if (pre_gs) { @@ -2093,7 +2093,6 @@ agx_compile_variant(struct agx_device *dev, struct pipe_context *pctx, compiled->gs_output_mode = gs_out_prim; compiled->gs_count_words = gs_out_count_words; compiled->info.outputs = outputs; - compiled->stage = so->type; ralloc_free(nir); ralloc_free(pre_gs);