[Impeller] fix image layout when resolve texture has mip levels.

flutter · Dec 15, 2024 · 37de16c · 37de16c
1 parent 93b7c61
commit 37de16c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc
@@ -24,8 +24,6 @@
 #include "impeller/renderer/backend/vulkan/sampler_vk.h"
 #include "impeller/renderer/backend/vulkan/shared_object_vk.h"
 #include "impeller/renderer/backend/vulkan/texture_vk.h"
-#include "vulkan/vulkan.hpp"
-#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {
 
@@ -91,15 +89,8 @@ SharedHandleVK<vk::RenderPass> RenderPassVK::CreateVKRenderPass(
             attachment.texture->GetTextureDescriptor().format,        //
             attachment.texture->GetTextureDescriptor().sample_count,  //
             attachment.load_action,                                   //
-            attachment.store_action,                                  //
-            TextureVK::Cast(*attachment.texture).GetLayout()          //
+            attachment.store_action                                   //
         );
-        TextureVK::Cast(*attachment.texture)
-            .SetLayoutWithoutEncoding(vk::ImageLayout::eGeneral);
-        if (attachment.resolve_texture) {
-          TextureVK::Cast(*attachment.resolve_texture)
-              .SetLayoutWithoutEncoding(vk::ImageLayout::eGeneral);
-        }
         return true;
       });
 
@@ -202,6 +193,30 @@ RenderPassVK::RenderPassVK(const std::shared_ptr<const Context>& context,
   pass_info.setPClearValues(clears.data());
   pass_info.setClearValueCount(clear_count);
 
+  if (resolve_image_vk_) {
+    // If the resolve image has mip levels, only mip level 0 will be
+    // transitioned by the render pass. All subsequent mip levels must have an
+    // explicit barrier inserted to transition from undefined.
+    if (resolve_image_vk_->GetTextureDescriptor().mip_count > 1) {
+      BarrierVK barrier;
+      barrier.new_layout = vk::ImageLayout::eGeneral;
+      barrier.cmd_buffer = command_buffer_vk_;
+      barrier.src_access = vk::AccessFlagBits::eShaderRead;
+      barrier.src_stage = vk::PipelineStageFlagBits::eFragmentShader;
+      barrier.dst_access = vk::AccessFlagBits::eColorAttachmentWrite |
+                           vk::AccessFlagBits::eTransferWrite;
+      barrier.dst_stage = vk::PipelineStageFlagBits::eColorAttachmentOutput |
+                          vk::PipelineStageFlagBits::eTransfer;
+      TextureVK::Cast(*resolve_image_vk_).SetLayout(barrier);
+    } else {
+      TextureVK::Cast(*resolve_image_vk_)
+          .SetLayoutWithoutEncoding(vk::ImageLayout::eGeneral);
+    }
+  } else if (color_image_vk_) {
+    TextureVK::Cast(*resolve_image_vk_)
+        .SetLayoutWithoutEncoding(vk::ImageLayout::eGeneral);
+  }
+
   command_buffer_vk_.beginRenderPass(pass_info, vk::SubpassContents::eInline);
 
   // Set the initial viewport.

diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.h b/impeller/renderer/backend/vulkan/render_pass_vk.h
@@ -12,7 +12,6 @@
 #include "impeller/renderer/command_buffer.h"
 #include "impeller/renderer/render_pass.h"
 #include "impeller/renderer/render_target.h"
-#include "vulkan/vulkan_handles.hpp"
 
 namespace impeller {