diff options
| author | Iago Toral Quiroga <itoral@igalia.com> | 2020-04-06 12:51:25 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-10-13 21:21:29 +0000 |
| commit | 360adff215441a5b96a343be7d902ee08a1fd9c7 (patch) | |
| tree | 6dbca04afcea45549d1e908ec78b71d70109a46c /src/broadcom | |
| parent | 03a150c8ab59ca919db046bffc27d0704a06452d (diff) | |
v3dv: fix incorrect attachment reference
We were using the subpass render target index to index into the framebuffer,
which is not correct, since the framebuffer is defined for the render pass.
We should use the attachment index instead.
Fixes:
dEQP-VK.renderpass.suballocation.attachment_allocation.roll.{40,48}
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
Diffstat (limited to 'src/broadcom')
| -rw-r--r-- | src/broadcom/vulkan/v3dv_meta_clear.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/broadcom/vulkan/v3dv_meta_clear.c b/src/broadcom/vulkan/v3dv_meta_clear.c index 77f0da595ba..8aba32ad53d 100644 --- a/src/broadcom/vulkan/v3dv_meta_clear.c +++ b/src/broadcom/vulkan/v3dv_meta_clear.c @@ -504,7 +504,7 @@ emit_color_clear_rect(struct v3dv_cmd_buffer *cmd_buffer, * format. */ struct v3dv_image_view attachment_layer_view; - memcpy(&attachment_layer_view, subpass_fb->attachments[rt_idx], + memcpy(&attachment_layer_view, subpass_fb->attachments[attachment_idx], sizeof(struct v3dv_image_view)); if (vk_format_is_depth_or_stencil(attachment_layer_view.vk_format)) { attachment_layer_view.aspects = VK_IMAGE_ASPECT_COLOR_BIT; @@ -527,7 +527,8 @@ emit_color_clear_rect(struct v3dv_cmd_buffer *cmd_buffer, uint32_t dirty_dynamic_state = 0; for (uint32_t i = 0; i < rect->layerCount; i++) { attachment_layer_view.first_layer = - subpass_fb->attachments[rt_idx]->first_layer + rect->baseArrayLayer + i; + subpass_fb->attachments[attachment_idx]->first_layer + + rect->baseArrayLayer + i; attachment_layer_view.last_layer = attachment_layer_view.first_layer; VkImageView fb_attachment = |