From 9efa3405a7ad6552ff6b4f0986962ee475da0def Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 29 Jan 2019 22:19:03 +0100 Subject: [PATCH] radv: do not set preserveAttachments for internal render passes We don't use that. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_meta_blit.c | 12 ++++++------ src/amd/vulkan/radv_meta_blit2d.c | 12 ++++++------ src/amd/vulkan/radv_meta_clear.c | 8 ++++---- src/amd/vulkan/radv_meta_resolve_fs.c | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c index ef690edb471..a2ba7e45022 100644 --- a/src/amd/vulkan/radv_meta_blit.c +++ b/src/amd/vulkan/radv_meta_blit.c @@ -950,8 +950,8 @@ radv_device_init_meta_blit_color(struct radv_device *device, bool on_demand) .attachment = VK_ATTACHMENT_UNUSED, .layout = VK_IMAGE_LAYOUT_GENERAL, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, &device->meta_state.blit.render_pass[key][j]); @@ -1010,8 +1010,8 @@ radv_device_init_meta_blit_depth(struct radv_device *device, bool on_demand) .attachment = 0, .layout = layout, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, &device->meta_state.blit.depth_only_rp[ds_layout]); @@ -1067,8 +1067,8 @@ radv_device_init_meta_blit_stencil(struct radv_device *device, bool on_demand) .attachment = 0, .layout = layout, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, &device->meta_state.blit.stencil_only_rp[ds_layout]); diff --git a/src/amd/vulkan/radv_meta_blit2d.c b/src/amd/vulkan/radv_meta_blit2d.c index d710749afab..c99d59c65d0 100644 --- a/src/amd/vulkan/radv_meta_blit2d.c +++ b/src/amd/vulkan/radv_meta_blit2d.c @@ -807,8 +807,8 @@ blit2d_init_color_pipeline(struct radv_device *device, .attachment = VK_ATTACHMENT_UNUSED, .layout = layout, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, &device->meta_state.blit2d_render_passes[fs_key][dst_layout]); @@ -978,8 +978,8 @@ blit2d_init_depth_only_pipeline(struct radv_device *device, .attachment = 0, .layout = layout, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, &device->meta_state.blit2d_depth_only_rp[ds_layout]); @@ -1148,8 +1148,8 @@ blit2d_init_stencil_only_pipeline(struct radv_device *device, .attachment = 0, .layout = layout, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, &device->meta_state.blit2d_stencil_only_rp[ds_layout]); diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index c68ce1ee8a8..819ec060fc6 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -232,8 +232,8 @@ create_color_renderpass(struct radv_device *device, .attachment = VK_ATTACHMENT_UNUSED, .layout = VK_IMAGE_LAYOUT_GENERAL, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, pass); @@ -532,8 +532,8 @@ create_depthstencil_renderpass(struct radv_device *device, .attachment = 0, .layout = VK_IMAGE_LAYOUT_GENERAL, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, render_pass); diff --git a/src/amd/vulkan/radv_meta_resolve_fs.c b/src/amd/vulkan/radv_meta_resolve_fs.c index 4debbc17c01..3c63195f48f 100644 --- a/src/amd/vulkan/radv_meta_resolve_fs.c +++ b/src/amd/vulkan/radv_meta_resolve_fs.c @@ -232,8 +232,8 @@ create_resolve_pipeline(struct radv_device *device, .attachment = VK_ATTACHMENT_UNUSED, .layout = VK_IMAGE_LAYOUT_GENERAL, }, - .preserveAttachmentCount = 1, - .pPreserveAttachments = (uint32_t[]) { 0 }, + .preserveAttachmentCount = 0, + .pPreserveAttachments = NULL, }, .dependencyCount = 0, }, &device->meta_state.alloc, rp + dst_layout); -- 2.30.2