Module: Mesa Branch: main Commit: 97dc28b177649e40a4f2a15af65ebb69ee06b6fe URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=97dc28b177649e40a4f2a15af65ebb69ee06b6fe
Author: Samuel Pitoiset <[email protected]> Date: Tue May 17 15:59:03 2022 +0200 radv: fix configuring COLOR_INVALID on GFX11 It's a different bitfield but this one was missing. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16557> --- src/amd/vulkan/radv_cmd_buffer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index e87ab42b2b0..23f374a42b1 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2526,11 +2526,13 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) struct vk_framebuffer *framebuffer = cmd_buffer->state.framebuffer; const struct radv_subpass *subpass = cmd_buffer->state.subpass; bool disable_constant_encode_ac01 = false; + unsigned color_invalid = cmd_buffer->device->physical_device->rad_info.gfx_level >= GFX11 + ? G_028C70_FORMAT_GFX11(V_028C70_COLOR_INVALID) + : G_028C70_FORMAT_GFX6(V_028C70_COLOR_INVALID); for (i = 0; i < subpass->color_count; ++i) { if (subpass->color_attachments[i].attachment == VK_ATTACHMENT_UNUSED) { - radeon_set_context_reg(cmd_buffer->cs, R_028C70_CB_COLOR0_INFO + i * 0x3C, - S_028C70_FORMAT_GFX6(V_028C70_COLOR_INVALID)); + radeon_set_context_reg(cmd_buffer->cs, R_028C70_CB_COLOR0_INFO + i * 0x3C, color_invalid); continue; } @@ -2557,8 +2559,7 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer) } } for (; i < cmd_buffer->state.last_subpass_color_count; i++) { - radeon_set_context_reg(cmd_buffer->cs, R_028C70_CB_COLOR0_INFO + i * 0x3C, - S_028C70_FORMAT_GFX6(V_028C70_COLOR_INVALID)); + radeon_set_context_reg(cmd_buffer->cs, R_028C70_CB_COLOR0_INFO + i * 0x3C, color_invalid); } cmd_buffer->state.last_subpass_color_count = subpass->color_count;
