From d40dd4bfb7cfb8abf248bddec3bb72c648f89d5c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 5 Feb 2025 13:02:53 -0500 Subject: [PATCH] radv: rewrite radv_get_line_mode() conditional this was weirdly hard to parse Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 5a9840b8664..6fe461ee667 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1036,9 +1036,8 @@ radv_get_line_mode(const struct radv_cmd_buffer *cmd_buffer) const unsigned rast_prim = radv_get_rasterization_prim(cmd_buffer); - bool draw_lines = radv_rast_prim_is_line(rast_prim) || radv_polygon_mode_is_line(d->vk.rs.polygon_mode); - draw_lines &= !radv_rast_prim_is_point(rast_prim); - draw_lines &= !radv_polygon_mode_is_point(d->vk.rs.polygon_mode); + const bool draw_lines = (radv_rast_prim_is_line(rast_prim) && !radv_polygon_mode_is_point(d->vk.rs.polygon_mode)) || + (radv_polygon_mode_is_line(d->vk.rs.polygon_mode) && !radv_rast_prim_is_point(rast_prim)); if (draw_lines) return d->vk.rs.line.mode;