From 82abbe19c92ee26f581006e949196e85fd1a73c9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 31 Mar 2023 16:04:31 -0400 Subject: [PATCH] zink: move separate shader dsl creation to compiler function no functional changes, just reordering Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 1 + src/gallium/drivers/zink/zink_program.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 78efe6f..cc37144 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -3657,6 +3657,7 @@ zink_shader_compile_separate(struct zink_screen *screen, struct zink_shader *zs) } } optimize_nir(nir, zs); + zink_descriptor_shader_init(screen, zs); struct zink_shader_object obj = compile_module(screen, zs, nir); ralloc_free(nir); return obj; diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index fc9e215..a10b363 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2056,7 +2056,6 @@ precompile_separate_shader_job(void *data, void *gdata, int thread_index) struct zink_shader *zs = data; zs->precompile.obj = zink_shader_compile_separate(screen, zs); - zink_descriptor_shader_init(screen, zs); VkShaderModule mods[ZINK_GFX_SHADER_COUNT] = {0}; mods[zs->info.stage] = zs->precompile.obj.mod; zs->precompile.gpl = zink_create_gfx_pipeline_separate(screen, mods, zs->precompile.layout); -- 2.7.4