Vulkan: Render pass creation cleanup

src/libANGLE/renderer/vulkan/vk_cache_utils.cpp

@@ -736,6 +736,8 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
                                            const AttachmentOpsArray &ops,
                                            RenderPass *renderPass)
 {
+    RendererVk *renderer = context->getRenderer();
+
     constexpr VkAttachmentReference kUnusedAttachment   = {VK_ATTACHMENT_UNUSED,
                                                          VK_IMAGE_LAYOUT_UNDEFINED};
     constexpr VkAttachmentReference2 kUnusedAttachment2 = {
@@ -751,6 +753,9 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
     // The list of attachments includes all non-resolve and resolve attachments.
     FramebufferAttachmentArray<VkAttachmentDescription> attachmentDescs;
 
+    const bool hasUnresolveAttachments =
+        desc.getColorUnresolveAttachmentMask().any() || desc.hasDepthStencilUnresolveAttachment();
+
     // Pack color attachments
     PackedAttachmentIndex attachmentCount(0);
     for (uint32_t colorIndexGL = 0; colorIndexGL < desc.colorAttachmentRange(); ++colorIndexGL)
@@ -772,7 +777,7 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
 
         angle::FormatID formatID = desc[colorIndexGL];
         ASSERT(formatID != angle::FormatID::NONE);
-        const vk::Format &format = context->getRenderer()->getFormat(formatID);
+        const vk::Format &format = renderer->getFormat(formatID);
 
         VkAttachmentReference colorRef;
         colorRef.attachment = attachmentCount.get();
@@ -794,7 +799,7 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
 
         angle::FormatID formatID = desc[depthStencilIndexGL];
         ASSERT(formatID != angle::FormatID::NONE);
-        const vk::Format &format = context->getRenderer()->getFormat(formatID);
+        const vk::Format &format = renderer->getFormat(formatID);
 
         depthStencilAttachmentRef.attachment = attachmentCount.get();
 
@@ -828,7 +833,7 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
 
         ASSERT(desc.isColorAttachmentEnabled(colorIndexGL));
 
-        const vk::Format &format = context->getRenderer()->getFormat(desc[colorIndexGL]);
+        const vk::Format &format = renderer->getFormat(desc[colorIndexGL]);
 
         VkAttachmentReference colorRef;
         colorRef.attachment = attachmentCount.get();
@@ -849,7 +854,7 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
 
         uint32_t depthStencilIndexGL = static_cast<uint32_t>(desc.depthStencilAttachmentIndex());
 
-        const vk::Format &format = context->getRenderer()->getFormat(desc[depthStencilIndexGL]);
+        const vk::Format &format = renderer->getFormat(desc[depthStencilIndexGL]);
 
         depthStencilResolveAttachmentRef.attachment = attachmentCount.get();
         depthStencilResolveAttachmentRef.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
@@ -873,7 +878,7 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
     VkAttachmentReference unresolveDepthStencilAttachmentRef = kUnusedAttachment;
     FramebufferAttachmentsVector<VkAttachmentReference> unresolveInputAttachmentRefs;
     FramebufferAttachmentsVector<uint32_t> unresolvePreserveAttachmentRefs;
-    if (desc.getColorUnresolveAttachmentMask().any() || desc.hasDepthStencilUnresolveAttachment())
+    if (hasUnresolveAttachments)
     {
         subpassDesc.push_back({});
         InitializeUnresolveSubpass(
@@ -919,7 +924,7 @@ angle::Result InitializeRenderPassFromDesc(Context *context,
     }
 
     std::vector<VkSubpassDependency> subpassDependencies;
-    if (desc.getColorUnresolveAttachmentMask().any() || desc.hasDepthStencilUnresolveAttachment())
+    if (hasUnresolveAttachments)
     {
         InitializeUnresolveSubpassDependencies(
             subpassDesc, desc.getColorUnresolveAttachmentMask().any(),

src/libANGLE/renderer/vulkan/vk_helpers.cpp

@@ -1002,12 +1002,8 @@ angle::Result CommandBufferHelper::flushToPrimary(ContextVk *contextVk,
     {
         mCommandBuffer.executeQueuedResetQueryPoolCommands(primary->getHandle());
         // Pull a RenderPass from the cache.
-        RenderPassCache &renderPassCache = contextVk->getRenderPassCache();
-        Serial serial                    = contextVk->getCurrentQueueSerial();
-
         RenderPass *renderPass = nullptr;
-        ANGLE_TRY(renderPassCache.getRenderPassWithOps(contextVk, serial, mRenderPassDesc,
-                                                       mAttachmentOps, &renderPass));
+        ANGLE_TRY(contextVk->getRenderPassWithOps(mRenderPassDesc, mAttachmentOps, &renderPass));
 
         VkRenderPassBeginInfo beginInfo    = {};
         beginInfo.sType                    = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;