Module: Mesa Branch: main Commit: df3f2c89f5ba040f7f47ef566e7d2fc92bdeb97d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df3f2c89f5ba040f7f47ef566e7d2fc92bdeb97d
Author: Konstantin Seurer <[email protected]> Date: Tue Jul 18 15:12:15 2023 +0200 radv/meta_buffer: Rename size_minus16 to max_offset It's just better. Reviewed-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24213> --- src/amd/vulkan/meta/radv_meta_buffer.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/amd/vulkan/meta/radv_meta_buffer.c b/src/amd/vulkan/meta/radv_meta_buffer.c index 94d75be3c51..5cef44da9f7 100644 --- a/src/amd/vulkan/meta/radv_meta_buffer.c +++ b/src/amd/vulkan/meta/radv_meta_buffer.c @@ -12,14 +12,14 @@ build_buffer_fill_shader(struct radv_device *dev) nir_ssa_def *pconst = nir_load_push_constant(&b, 4, 32, nir_imm_int(&b, 0), .range = 16); nir_ssa_def *buffer_addr = nir_pack_64_2x32(&b, nir_channels(&b, pconst, 0b0011)); - nir_ssa_def *size_minus16 = nir_channel(&b, pconst, 2); + nir_ssa_def *max_offset = nir_channel(&b, pconst, 2); nir_ssa_def *data = nir_swizzle(&b, nir_channel(&b, pconst, 3), (unsigned[]){0, 0, 0, 0}, 4); nir_ssa_def *global_id = nir_iadd( &b, nir_imul_imm(&b, nir_channel(&b, nir_load_workgroup_id(&b, 32), 0), b.shader->info.workgroup_size[0]), nir_load_local_invocation_index(&b)); - nir_ssa_def *offset = nir_imin(&b, nir_imul_imm(&b, global_id, 16), size_minus16); + nir_ssa_def *offset = nir_imin(&b, nir_imul_imm(&b, global_id, 16), max_offset); nir_ssa_def *dst_addr = nir_iadd(&b, buffer_addr, nir_u2u64(&b, offset)); nir_build_store_global(&b, data, dst_addr, .align_mul = 4); @@ -33,7 +33,7 @@ build_buffer_copy_shader(struct radv_device *dev) b.shader->info.workgroup_size[0] = 64; nir_ssa_def *pconst = nir_load_push_constant(&b, 4, 32, nir_imm_int(&b, 0), .range = 16); - nir_ssa_def *size_minus16 = nir_load_push_constant(&b, 1, 32, nir_imm_int(&b, 0), .base = 16, .range = 4); + nir_ssa_def *max_offset = nir_load_push_constant(&b, 1, 32, nir_imm_int(&b, 0), .base = 16, .range = 4); nir_ssa_def *src_addr = nir_pack_64_2x32(&b, nir_channels(&b, pconst, 0b0011)); nir_ssa_def *dst_addr = nir_pack_64_2x32(&b, nir_channels(&b, pconst, 0b1100)); @@ -41,7 +41,7 @@ build_buffer_copy_shader(struct radv_device *dev) &b, nir_imul_imm(&b, nir_channel(&b, nir_load_workgroup_id(&b, 32), 0), b.shader->info.workgroup_size[0]), nir_load_local_invocation_index(&b)); - nir_ssa_def *offset = nir_u2u64(&b, nir_imin(&b, nir_imul_imm(&b, global_id, 16), size_minus16)); + nir_ssa_def *offset = nir_u2u64(&b, nir_imin(&b, nir_imul_imm(&b, global_id, 16), max_offset)); nir_ssa_def *data = nir_build_load_global(&b, 4, 32, nir_iadd(&b, src_addr, offset), .align_mul = 4); nir_build_store_global(&b, data, nir_iadd(&b, dst_addr, offset), .align_mul = 4); @@ -51,14 +51,14 @@ build_buffer_copy_shader(struct radv_device *dev) struct fill_constants { uint64_t addr; - uint32_t size_minus16; + uint32_t max_offset; uint32_t data; }; struct copy_constants { uint64_t src_addr; uint64_t dst_addr; - uint32_t size_minus16; + uint32_t max_offset; }; VkResult @@ -167,7 +167,7 @@ fill_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t va, uint64_t siz struct fill_constants fill_consts = { .addr = va, - .size_minus16 = size - 16, + .max_offset = size - 16, .data = data, }; @@ -195,7 +195,7 @@ copy_buffer_shader(struct radv_cmd_buffer *cmd_buffer, uint64_t src_va, uint64_t struct copy_constants copy_consts = { .src_addr = src_va, .dst_addr = dst_va, - .size_minus16 = size - 16, + .max_offset = size - 16, }; radv_CmdPushConstants(radv_cmd_buffer_to_handle(cmd_buffer), device->meta_state.buffer.copy_p_layout,
