Module: Mesa Branch: main Commit: 64395f0d85ae7f74ec386ed6f0c2f09ae20b2a56 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64395f0d85ae7f74ec386ed6f0c2f09ae20b2a56
Author: Mike Blumenkrantz <[email protected]> Date: Wed Aug 10 14:43:22 2022 -0400 radv: remove stupid conditional from draw path compilers are now provably smart enough to handle this Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17993> --- src/amd/vulkan/radv_cmd_buffer.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 9b6d43400f4..247956545c5 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6754,16 +6754,10 @@ radv_emit_userdata_vertex(struct radv_cmd_buffer *cmd_buffer, const struct radv_ const bool uses_baseinstance = state->graphics_pipeline->uses_baseinstance; const bool uses_drawid = state->graphics_pipeline->uses_drawid; - /* this looks very dumb, but it allows the compiler to optimize better and yields - * ~3-4% perf increase in drawoverhead - */ - if (vertex_offset != state->last_vertex_offset) { - radv_emit_userdata_vertex_internal(cmd_buffer, info, vertex_offset); - } else if (uses_drawid && 0 != state->last_drawid) { + if (vertex_offset != state->last_vertex_offset || + (uses_drawid && 0 != state->last_drawid) || + (uses_baseinstance && info->first_instance != state->last_first_instance)) radv_emit_userdata_vertex_internal(cmd_buffer, info, vertex_offset); - } else if (uses_baseinstance && info->first_instance != state->last_first_instance) { - radv_emit_userdata_vertex_internal(cmd_buffer, info, vertex_offset); - } } ALWAYS_INLINE static void
