radv: do not set preserveAttachments for internal render passes

We don't use that.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c
index ef690edb4711413db578faebba0e7b0cdc51c308..a2ba7e4502241c062509b564f4e947f490679395 100644 (file)
--- 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 d710749afabb9883ef83a42a6bf7b03ec293bec6..c99d59c65d082b00e81babbf21030149265b6b37 100644 (file)
--- 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 c68ce1ee8a80fbacbef93a1ce2e39a4ccfa24b74..819ec060fc6aab2d879f8647bc806c21554097fb 100644 (file)
--- 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 4debbc17c0179196be113020678c7bd8cdec682f..3c63195f48f69ee6cc8a3a748e2afb65576bda21 100644 (file)
--- 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);