Module: Mesa Branch: staging/22.0 Commit: 6a17b43ba092fde5c31ef92881b1ee9b7940e89b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a17b43ba092fde5c31ef92881b1ee9b7940e89b
Author: Samuel Pitoiset <[email protected]> Date: Tue May 3 12:14:38 2022 +0200 radv: re-emit dynamic line stipple state if the primitive topology changed The dynamic primitive topology could change from LINE_LIST to LINE_STRIP for example and the stipple state depends on this. Found by inspection. Cc: mesa-stable Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16295> (cherry picked from commit f5cffbb8df7721efc1698ea2289f40b8e6372f9e) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d9e8aa73272..a404ae6e3d2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -364,7 +364,7 @@ "description": "radv: re-emit dynamic line stipple state if the primitive topology changed", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "because_sha": null }, { diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 26b96f3ada9..6595e4daf01 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3085,7 +3085,8 @@ radv_cmd_buffer_flush_dynamic_state(struct radv_cmd_buffer *cmd_buffer, bool pip if (states & RADV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) radv_emit_sample_locations(cmd_buffer); - if (states & RADV_CMD_DIRTY_DYNAMIC_LINE_STIPPLE) + if (states & (RADV_CMD_DIRTY_DYNAMIC_LINE_STIPPLE | + RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY)) radv_emit_line_stipple(cmd_buffer); if (states & (RADV_CMD_DIRTY_DYNAMIC_CULL_MODE | RADV_CMD_DIRTY_DYNAMIC_FRONT_FACE |
