Module: Mesa Branch: main Commit: 64f1960915b8d7f144d7286a7b1f22a06852bfbc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64f1960915b8d7f144d7286a7b1f22a06852bfbc
Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 9 15:40:39 2022 -0500 zink: make spirv_builder_emit_exec_mode_literal() return the word for the param Reviewed-by: Dave Airlie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14976> --- src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c | 4 ++-- src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c index 26b8baac585..44a0ad5bbfc 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c @@ -150,7 +150,7 @@ spirv_builder_emit_entry_point(struct spirv_builder *b, spirv_buffer_emit_word(&b->entry_points, interfaces[i]); } -void +uint32_t spirv_builder_emit_exec_mode_literal(struct spirv_builder *b, SpvId entry_point, SpvExecutionMode exec_mode, uint32_t param) { @@ -158,7 +158,7 @@ spirv_builder_emit_exec_mode_literal(struct spirv_builder *b, SpvId entry_point, spirv_buffer_emit_word(&b->exec_modes, SpvOpExecutionMode | (4 << 16)); spirv_buffer_emit_word(&b->exec_modes, entry_point); spirv_buffer_emit_word(&b->exec_modes, exec_mode); - spirv_buffer_emit_word(&b->exec_modes, param); + return spirv_buffer_emit_word(&b->exec_modes, param); } void diff --git a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h index 5c91f951817..26b523c6fdb 100644 --- a/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h +++ b/src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h @@ -146,7 +146,7 @@ spirv_builder_emit_entry_point(struct spirv_builder *b, SpvExecutionModel exec_model, SpvId entry_point, const char *name, const SpvId interfaces[], size_t num_interfaces); -void +uint32_t spirv_builder_emit_exec_mode_literal(struct spirv_builder *b, SpvId entry_point, SpvExecutionMode exec_mode, uint32_t param); void
