Module: Mesa Branch: staging/22.2 Commit: 1ddca523249e87f8359c8f391da8854e3a83a6e2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ddca523249e87f8359c8f391da8854e3a83a6e2
Author: Erik Faye-Lund <[email protected]> Date: Thu Aug 25 09:23:57 2022 +0200 zink: type_main -> type_void_func This type will be reused later on, so let's have the name describe what is *is*, not what it's *used for*. Cc: mesa-stable Reviewed-by: Mike Blumenkrantz <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18244> (cherry picked from commit 41dfed6e1235de20eb55f9c445ffe36673cea5b3) --- .pick_status.json | 2 +- src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 257fe62411a..6a19d09b544 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -10246,7 +10246,7 @@ "description": "zink: type_main -> type_void_func", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c index 71bae40cc76..2a3bd81e314 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c +++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c @@ -4270,8 +4270,8 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_ } SpvId type_void = spirv_builder_type_void(&ctx.builder); - SpvId type_main = spirv_builder_type_function(&ctx.builder, type_void, - NULL, 0); + SpvId type_void_func = spirv_builder_type_function(&ctx.builder, type_void, + NULL, 0); SpvId entry_point = spirv_builder_new_id(&ctx.builder); spirv_builder_emit_name(&ctx.builder, entry_point, "main"); @@ -4412,8 +4412,8 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_ SpvExecutionModeXfb); } spirv_builder_function(&ctx.builder, entry_point, type_void, - SpvFunctionControlMaskNone, - type_main); + SpvFunctionControlMaskNone, + type_void_func); nir_function_impl *entry = nir_shader_get_entrypoint(s); nir_metadata_require(entry, nir_metadata_block_index);
