Module: Mesa Branch: staging/22.3 Commit: 35e0e08c33c80cbbe987b6ddd5a4e9f048a436d0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35e0e08c33c80cbbe987b6ddd5a4e9f048a436d0
Author: Samuel Pitoiset <[email protected]> Date: Thu Nov 10 15:24:24 2022 +0100 radv: re-emit NGG culling settings when conservative rast mode is dynamic Found by inspection. Fixes: fbed3aed4aa ("radv: add support for dynamic conservative rasterization mode") Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19651> (cherry picked from commit 08b346e81ac262578ed0437464148be6500ea4de) --- .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 abd31ef46d3..d6908a89d35 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -49,7 +49,7 @@ "description": "radv: re-emit NGG culling settings when conservative rast mode is dynamic", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "fbed3aed4aa6184a8d1ea696de44973e235d89a8" }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 430b8d40be6..f9ff4ef73d9 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -7541,7 +7541,8 @@ radv_emit_ngg_culling_state(struct radv_cmd_buffer *cmd_buffer, const struct rad cmd_buffer->state.dirty & (RADV_CMD_DIRTY_PIPELINE | RADV_CMD_DIRTY_DYNAMIC_CULL_MODE | RADV_CMD_DIRTY_DYNAMIC_FRONT_FACE | - RADV_CMD_DIRTY_DYNAMIC_RASTERIZER_DISCARD_ENABLE | RADV_CMD_DIRTY_DYNAMIC_VIEWPORT); + RADV_CMD_DIRTY_DYNAMIC_RASTERIZER_DISCARD_ENABLE | RADV_CMD_DIRTY_DYNAMIC_VIEWPORT | + RADV_CMD_DIRTY_DYNAMIC_CONSERVATIVE_RAST_MODE); /* Check small draw status: * For small draw calls, we disable culling by setting the SGPR to 0.
