From a01dc831a792e4722838f76575ccb5fdf17bf457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 13 Jan 2021 15:16:53 +0100 Subject: [PATCH] Vk: wait, these "V1" structs are not used for anything. A forgotten leftover from the initial RenderPass design. These used to be created right at construction, but I eventually changed that to be only done explicitly via a getter. --- src/Magnum/Vk/RenderPass.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/Magnum/Vk/RenderPass.cpp b/src/Magnum/Vk/RenderPass.cpp index c907eeacd..b9b0fe0cd 100644 --- a/src/Magnum/Vk/RenderPass.cpp +++ b/src/Magnum/Vk/RenderPass.cpp @@ -279,16 +279,12 @@ template void SubpassDescription::setColorAttachmentsInternal(Container resolveWrappers; Containers::ArrayView vkAttachments2, vkResolveAttachments2; - Containers::ArrayView vkAttachments, - vkResolveAttachments; _state->colorAttachments = Containers::ArrayTuple{ {NoInit, attachments.size(), wrappers}, {NoInit, resolveAttachments.size(), resolveWrappers}, {NoInit, attachments.size(), vkAttachments2}, - {NoInit, resolveAttachments.size(), vkResolveAttachments2}, - {NoInit, attachments.size(), vkAttachments}, - {NoInit, resolveAttachments.size(), vkResolveAttachments} + {NoInit, resolveAttachments.size(), vkResolveAttachments2} }; for(std::size_t i = 0; i != attachments.size(); ++i) { @@ -296,10 +292,6 @@ template void SubpassDescription::setColorAttachmentsInternal(Container /* Can't use {} with GCC 4.8 here because it tries to initialize the first member instead of doing a copy */ new(vkAttachments2 + i) VkAttachmentReference2(*wrappers[i]); - new(vkAttachments + i) VkAttachmentReference{ - vkAttachments2[i].attachment, - vkAttachments2[i].layout - }; } if(!resolveAttachments.empty()) for(std::size_t i = 0; i != attachments.size(); ++i) { @@ -307,10 +299,6 @@ template void SubpassDescription::setColorAttachmentsInternal(Container /* Can't use {} with GCC 4.8 here because it tries to initialize the first member instead of doing a copy */ new(vkResolveAttachments2 + i) VkAttachmentReference2(*resolveWrappers[i]); - new(vkResolveAttachments + i) VkAttachmentReference{ - vkResolveAttachments2[i].attachment, - vkResolveAttachments2[i].layout - }; } _description.colorAttachmentCount = attachments.size();