From 2b4609b66cd129d77a72ac1cc3502213d1c1640f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 29 Dec 2020 11:31:35 -0500 Subject: [PATCH] zink: run nir_convert_from_ssa last during compile running this too early breaks other passes Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 3d7f7417950..d314a75ccb0 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -503,6 +503,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z false, zink_fs_key(key)->coord_replace_yinvert); } } + NIR_PASS_V(nir, nir_convert_from_ssa, true); struct spirv_shader *spirv = nir_to_spirv(nir, streamout, shader_slot_map, shader_slots_reserved); assert(spirv); @@ -601,7 +602,6 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir, NIR_PASS_V(nir, lower_64bit_vertex_attribs); if (nir->info.num_ubos || nir->info.num_ssbos) NIR_PASS_V(nir, nir_lower_dynamic_bo_access); - NIR_PASS_V(nir, nir_convert_from_ssa, true); if (zink_debug & ZINK_DEBUG_NIR) { fprintf(stderr, "NIR shader:\n---8<---\n");