No wait + GL_LINEAR.

Author: chinmaygarde

impeller/toolkit/glvk/trampoline.cc

@@ -281,10 +281,8 @@ bool Trampoline::BlitTextureOpenGLToVulkan(
 
   gl.ActiveTexture(GL_TEXTURE0);
   gl.BindTexture(src_texture.target, src_texture.texture);
-  // Sampling from the source is always nearest. The sampling from the Vulkan
-  // texture is user-specified.
-  gl.TexParameteri(src_texture.target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-  gl.TexParameteri(src_texture.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+  gl.TexParameteri(src_texture.target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+  gl.TexParameteri(src_texture.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl.TexParameteri(src_texture.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl.TexParameteri(src_texture.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl.Uniform1i(texture_uniform_location_, 0u);

shell/platform/android/surface_texture_external_texture_vk_impeller.cc

@@ -37,9 +37,15 @@ SurfaceTextureExternalTextureVKImpeller::
 SurfaceTextureExternalTextureVKImpeller::
     ~SurfaceTextureExternalTextureVKImpeller() = default;
 
-static bool SetTextureLayoutSync(const ContextVK& context,
-                                 const TextureSourceVK* texture,
-                                 vk::ImageLayout layout) {
+enum class LayoutUpdateMode {
+  kSync,
+  kAsync,
+};
+
+static bool SetTextureLayout(const ContextVK& context,
+                             const TextureSourceVK* texture,
+                             vk::ImageLayout layout,
+                             LayoutUpdateMode mode) {
   TRACE_EVENT0("flutter", __FUNCTION__);
   if (!texture) {
     return true;
@@ -76,24 +82,32 @@ static bool SetTextureLayoutSync(const ContextVK& context,
 
   // There is no need to track the fence in the encoder since we are going to do
   // a sync wait for completion.
-  auto fence = context.GetDevice().createFenceUnique(vk::FenceCreateFlags{});
-  if (fence.result != impeller::vk::Result::eSuccess) {
-    VALIDATION_LOG << "Could not create fence.";
-    return false;
+  vk::UniqueFence fence;
+
+  if (mode == LayoutUpdateMode::kSync) {
+    auto fence_pair =
+        context.GetDevice().createFenceUnique(vk::FenceCreateFlags{});
+    if (fence_pair.result != impeller::vk::Result::eSuccess) {
+      VALIDATION_LOG << "Could not create fence.";
+      return false;
+    }
+    fence = std::move(fence_pair.value);
   }
 
-  if (context.GetGraphicsQueue()->Submit(submit_info, fence.value.get()) !=
+  if (context.GetGraphicsQueue()->Submit(submit_info, fence.get()) !=
       impeller::vk::Result::eSuccess) {
     VALIDATION_LOG << "Could not submit layout transition fence.";
     return false;
   }
 
   using namespace std::chrono_literals;
 
-  if (context.GetDevice().waitForFences(
-          fence.value.get(), VK_TRUE,
-          std::chrono::duration_cast<std::chrono::nanoseconds>(1s).count()) !=
-      impeller::vk::Result::eSuccess) {
+  if (fence &&
+      context.GetDevice().waitForFences(
+          fence.get(),                                                      //
+          VK_TRUE,                                                          //
+          std::chrono::duration_cast<std::chrono::nanoseconds>(1s).count()  //
+          ) != impeller::vk::Result::eSuccess) {
     VALIDATION_LOG << "Could not perform sync wait on fence.";
     return false;
   }
@@ -130,8 +144,9 @@ void SurfaceTextureExternalTextureVKImpeller::ProcessFrame(
   Attach(src_gl_texture);
   Update();
 
-  SetTextureLayoutSync(context_vk, dst_texture.get(),
-                       vk::ImageLayout::eColorAttachmentOptimal);
+  SetTextureLayout(context_vk, dst_texture.get(),
+                   vk::ImageLayout::eColorAttachmentOptimal,
+                   LayoutUpdateMode::kSync);
 
   SkM44 transformation(GetCurrentUVTransformation());
   impeller::Matrix uv_transformation;
@@ -146,8 +161,9 @@ void SurfaceTextureExternalTextureVKImpeller::ProcessFrame(
     VALIDATION_LOG << "Texture copy failed.";
   }
 
-  SetTextureLayoutSync(context_vk, dst_texture.get(),
-                       vk::ImageLayout::eShaderReadOnlyOptimal);
+  SetTextureLayout(context_vk, dst_texture.get(),
+                   vk::ImageLayout::eShaderReadOnlyOptimal,
+                   LayoutUpdateMode::kAsync);
 
   glDeleteTextures(1u, &src_gl_texture);