fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-29 04:10:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: wrap return of compile_module()

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22612>
This commit is contained in:
Mike Blumenkrantz 2023-03-31 15:00:24 -04:00 • committed by Marge Bot
parent aa2cf4d7f3
commit a1c994d60d
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/zink/zink_compiler.c
View file

@ -3408,7 +3408,7 @@ invert_point_coord(nir_shader *nir)
return nir_shader_instructions_pass(nir, invert_point_coord_instr, nir_metadata_dominance, NULL);
}
static VkShaderModule
static struct zink_shader_object
compile_module(struct zink_screen *screen, struct zink_shader *zs, nir_shader *nir)
{
VkShaderModule mod = VK_NULL_HANDLE;
@ -3426,14 +3426,14 @@ compile_module(struct zink_screen *screen, struct zink_shader *zs, nir_shader *n
zs->spirv = spirv;
else
ralloc_free(spirv);
return mod;
struct zink_shader_object obj = {.mod = mod};
return obj;
}
VkShaderModule
zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs,
nir_shader *nir, const struct zink_shader_key *key, const void *extra_data)
{
VkShaderModule mod = VK_NULL_HANDLE;
struct zink_shader_info *sinfo = &zs->sinfo;
bool need_optimize = false;
bool inlined_uniforms = false;
@ -3624,9 +3624,9 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs,
} else if (need_optimize)
optimize_nir(nir, zs);
mod = compile_module(screen, zs, nir);
struct zink_shader_object obj = compile_module(screen, zs, nir);
ralloc_free(nir);
return mod;
return obj.mod;
}
struct zink_shader_object
@ -3658,9 +3658,8 @@ zink_shader_compile_separate(struct zink_screen *screen, struct zink_shader *zs)
}
}
optimize_nir(nir, zs);
VkShaderModule mod = compile_module(screen, zs, nir);
struct zink_shader_object obj = compile_module(screen, zs, nir);
ralloc_free(nir);
struct zink_shader_object obj = {.mod = mod};
return obj;
}