Module: Mesa Branch: main Commit: 2e0893cf8b4f6b66088d1795a3aecff0cc5de230 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e0893cf8b4f6b66088d1795a3aecff0cc5de230
Author: Samuel Pitoiset <[email protected]> Date: Wed Jul 19 09:32:32 2023 +0200 radv: rename RADV_SHADER_QUERY_PIPELINE_STAT_OFFSET To RADV_SHADER_QUERY_GS_PRIM_EMIT_OFFSET. Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24231> --- src/amd/vulkan/nir/radv_nir_lower_abi.c | 2 +- src/amd/vulkan/radv_constants.h | 4 ++-- src/amd/vulkan/radv_query.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/vulkan/nir/radv_nir_lower_abi.c b/src/amd/vulkan/nir/radv_nir_lower_abi.c index aed4bb485e9..b0252ba977b 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_abi.c +++ b/src/amd/vulkan/nir/radv_nir_lower_abi.c @@ -347,7 +347,7 @@ lower_abi_instr(nir_builder *b, nir_instr *instr, void *state) break; } case nir_intrinsic_atomic_add_gs_emit_prim_count_amd: - nir_gds_atomic_add_amd(b, 32, intrin->src[0].ssa, nir_imm_int(b, RADV_SHADER_QUERY_PIPELINE_STAT_OFFSET), + nir_gds_atomic_add_amd(b, 32, intrin->src[0].ssa, nir_imm_int(b, RADV_SHADER_QUERY_GS_PRIM_EMIT_OFFSET), nir_imm_int(b, 0x100)); break; case nir_intrinsic_atomic_add_gen_prim_count_amd: diff --git a/src/amd/vulkan/radv_constants.h b/src/amd/vulkan/radv_constants.h index bf9a31eb74a..f508e1e5828 100644 --- a/src/amd/vulkan/radv_constants.h +++ b/src/amd/vulkan/radv_constants.h @@ -143,11 +143,11 @@ /* Shader GDS counters: * offset 0| 4| 8|12 - reserved for NGG streamout counters - * offset 16 - pipeline statistics counter for all streams + * offset 16 - number of primitives generated by geometry shader invocations * offset 20|24|28|32 - generated primitive counter for stream 0|1|2|3 * offset 36|40|44|48 - written primitive counter for stream 0|1|2|3 */ -#define RADV_SHADER_QUERY_PIPELINE_STAT_OFFSET 16 +#define RADV_SHADER_QUERY_GS_PRIM_EMIT_OFFSET 16 #define RADV_SHADER_QUERY_PRIM_GEN_OFFSET(stream) (20 + stream * 4) #define RADV_SHADER_QUERY_PRIM_XFB_OFFSET(stream) (36 + stream * 4) diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index d2d0819d9bd..dfcf546fae7 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -1738,7 +1738,7 @@ emit_begin_query(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *poo va += gs_prim_offset; /* pipeline statistics counter for all streams */ - gfx10_copy_gds_query(cmd_buffer, RADV_SHADER_QUERY_PIPELINE_STAT_OFFSET, va); + gfx10_copy_gds_query(cmd_buffer, RADV_SHADER_QUERY_GS_PRIM_EMIT_OFFSET, va); /* Record that the command buffer needs GDS. */ cmd_buffer->gds_needed = true; @@ -1882,7 +1882,7 @@ emit_end_query(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *pool, va += gs_prim_offset; /* pipeline statistics counter for all streams */ - gfx10_copy_gds_query(cmd_buffer, RADV_SHADER_QUERY_PIPELINE_STAT_OFFSET, va); + gfx10_copy_gds_query(cmd_buffer, RADV_SHADER_QUERY_GS_PRIM_EMIT_OFFSET, va); cmd_buffer->state.active_pipeline_gds_queries--;
