Merge branch 'master' into fix/CupertinoSliverNavigationBar-collapse-animation-infinite-loop

techouse · web-flow · commit 821e791041e7 · 2025-06-10T19:30:08.000+01:00
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/reactor_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/reactor_gles.cc
@@ -233,6 +233,9 @@ HandleGLES ReactorGLES::CreateHandle(HandleType type, GLuint external_handle) {
 }
 
 void ReactorGLES::CollectHandle(HandleGLES handle) {
+  if (handle.IsDead()) {
+    return;
+  }
   if (handle.untracked_id_.has_value()) {
     LiveHandle live_handle(GLStorage{.integer = handle.untracked_id_.value()});
     live_handle.pending_collection = true;
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/test/texture_gles_unittests.cc b/engine/src/flutter/impeller/renderer/backend/gles/test/texture_gles_unittests.cc
@@ -7,6 +7,7 @@
 #include "flutter/impeller/renderer/backend/gles/texture_gles.h"
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
+#include "impeller/base/validation.h"
 #include "impeller/core/formats.h"
 #include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/backend/gles/handle_gles.h"
@@ -93,4 +94,26 @@ TEST_P(TextureGLESTest, Binds2DTexture) {
   }
 }
 
+TEST_P(TextureGLESTest, Leak) {
+  TextureDescriptor desc;
+  desc.storage_mode = StorageMode::kDevicePrivate;
+  desc.size = {100, 100};
+  desc.format = PixelFormat::kR8G8B8A8UNormInt;
+  desc.type = TextureType::kTexture2D;
+  desc.sample_count = SampleCount::kCount1;
+
+  auto texture = GetContext()->GetResourceAllocator()->CreateTexture(desc);
+
+  ASSERT_TRUE(texture);
+
+  std::optional<GLuint> handle = TextureGLES::Cast(*texture).GetGLHandle();
+  EXPECT_TRUE(handle.has_value());
+
+  TextureGLES::Cast(*texture).Leak();
+
+  ScopedValidationDisable disable_validation;
+  handle = TextureGLES::Cast(*texture).GetGLHandle();
+  EXPECT_FALSE(handle.has_value());
+}
+
 }  // namespace impeller::testing
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.cc
@@ -16,6 +16,7 @@
 #include "impeller/core/formats.h"
 #include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/backend/gles/formats_gles.h"
+#include "impeller/renderer/backend/gles/handle_gles.h"
 
 namespace impeller {
 
@@ -229,6 +230,10 @@ TextureGLES::~TextureGLES() {
   }
 }
 
+void TextureGLES::Leak() {
+  handle_ = HandleGLES::DeadHandle();
+}
+
 // |Texture|
 bool TextureGLES::IsValid() const {
   return is_valid_;
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.h
@@ -102,6 +102,10 @@ class TextureGLES final : public Texture,
 
   bool IsWrapped() const;
 
+  /// @brief Reset the internal texture state so that the reactor will not free
+  ///        the associated handle.
+  void Leak();
+
   std::optional<GLuint> GetFBO() const;
 
   //----------------------------------------------------------------------------
diff --git a/engine/src/flutter/shell/platform/android/android_context_dynamic_impeller.h b/engine/src/flutter/shell/platform/android/android_context_dynamic_impeller.h
@@ -30,6 +30,9 @@ class AndroidContextDynamicImpeller : public AndroidContext {
   // |AndroidContext|
   bool IsValid() const override { return true; }
 
+  // |AndroidContext|
+  bool IsDynamicSelection() const override { return true; }
+
   // |AndroidContext|
   AndroidRenderingAPI RenderingApi() const override;
 
diff --git a/engine/src/flutter/shell/platform/android/context/android_context.cc b/engine/src/flutter/shell/platform/android/context/android_context.cc
@@ -50,4 +50,8 @@ std::shared_ptr<impeller::Context> AndroidContext::GetImpellerContext() const {
   return impeller_context_;
 }
 
+bool AndroidContext::IsDynamicSelection() const {
+  return false;
+}
+
 }  // namespace flutter
diff --git a/engine/src/flutter/shell/platform/android/context/android_context.h b/engine/src/flutter/shell/platform/android/context/android_context.h
@@ -39,6 +39,8 @@ class AndroidContext {
 
   virtual AndroidRenderingAPI RenderingApi() const;
 
+  virtual bool IsDynamicSelection() const;
+
   virtual bool IsValid() const;
 
   //----------------------------------------------------------------------------
diff --git a/engine/src/flutter/shell/platform/android/platform_view_android.cc b/engine/src/flutter/shell/platform/android/platform_view_android.cc
@@ -78,6 +78,11 @@ AndroidSurfaceFactoryImpl::AndroidSurfaceFactoryImpl(
 AndroidSurfaceFactoryImpl::~AndroidSurfaceFactoryImpl() = default;
 
 std::unique_ptr<AndroidSurface> AndroidSurfaceFactoryImpl::CreateSurface() {
+  if (android_context_->IsDynamicSelection()) {
+    auto cast_ptr = std::static_pointer_cast<AndroidContextDynamicImpeller>(
+        android_context_);
+    return std::make_unique<AndroidSurfaceDynamicImpeller>(cast_ptr);
+  }
   switch (android_context_->RenderingApi()) {
 #if !SLIMPELLER
     case AndroidRenderingAPI::kSoftware:
diff --git a/engine/src/flutter/shell/platform/android/surface_texture_external_texture_gl_impeller.cc b/engine/src/flutter/shell/platform/android/surface_texture_external_texture_gl_impeller.cc
@@ -55,6 +55,9 @@ void SurfaceTextureExternalTextureGLImpeller::ProcessFrame(
 
 void SurfaceTextureExternalTextureGLImpeller::Detach() {
   SurfaceTextureExternalTexture::Detach();
+  // Detach will collect the texture handle.
+  // See also: https://github.com/flutter/flutter/issues/152459
+  texture_->Leak();
   texture_.reset();
 }
 
diff --git a/engine/src/flutter/shell/platform/android/surface_texture_external_texture_gl_skia.cc b/engine/src/flutter/shell/platform/android/surface_texture_external_texture_gl_skia.cc
@@ -52,10 +52,9 @@ void SurfaceTextureExternalTextureGLSkia::ProcessFrame(PaintContext& context,
 
 void SurfaceTextureExternalTextureGLSkia::Detach() {
   SurfaceTextureExternalTexture::Detach();
-  if (texture_name_ != 0) {
-    glDeleteTextures(1, &texture_name_);
-    texture_name_ = 0;
-  }
+  // Detach will collect the texture handle.
+  // See also: https://github.com/flutter/flutter/issues/152459
+  texture_name_ = 0;
 }
 
 }  // namespace flutter
diff --git a/engine/src/flutter/testing/test_vulkan_context.cc b/engine/src/flutter/testing/test_vulkan_context.cc
@@ -49,7 +49,7 @@ TestVulkanContext::TestVulkanContext() {
 
   application_ = std::make_unique<vulkan::VulkanApplication>(
       *vk_, "Flutter Unittests", std::vector<std::string>{},
-      VK_MAKE_VERSION(1, 0, 0), VK_MAKE_VERSION(1, 0, 0), true);
+      VK_MAKE_VERSION(1, 0, 0), VK_MAKE_VERSION(1, 1, 0), true);
   if (!application_->IsValid()) {
     FML_LOG(ERROR) << "Failed to initialize basic Vulkan state.";
     return;
@@ -85,7 +85,7 @@ TestVulkanContext::TestVulkanContext() {
 
   sk_sp<skgpu::VulkanMemoryAllocator> allocator =
       flutter::FlutterSkiaVulkanMemoryAllocator::Make(
-          VK_MAKE_VERSION(1, 0, 0), application_->GetInstance(),
+          VK_MAKE_VERSION(1, 1, 0), application_->GetInstance(),
           device_->GetPhysicalDeviceHandle(), device_->GetHandle(), vk_, true);
 
   skgpu::VulkanExtensions extensions;
@@ -96,7 +96,7 @@ TestVulkanContext::TestVulkanContext() {
   backend_context.fDevice = device_->GetHandle();
   backend_context.fQueue = device_->GetQueueHandle();
   backend_context.fGraphicsQueueIndex = device_->GetGraphicsQueueIndex();
-  backend_context.fMaxAPIVersion = VK_MAKE_VERSION(1, 0, 0);
+  backend_context.fMaxAPIVersion = VK_MAKE_VERSION(1, 1, 0);
   backend_context.fDeviceFeatures = &features;
   backend_context.fVkExtensions = &extensions;
   backend_context.fGetProc = get_proc;

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,9 @@ HandleGLES ReactorGLES::CreateHandle(HandleType type, GLuint external_handle) {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`void ReactorGLES::CollectHandle(HandleGLES handle) {`
	`236`	`+ if (handle.IsDead()) {`
	`237`	`+ return;`
	`238`	`+ }`
`236`	`239`	`if (handle.untracked_id_.has_value()) {`
`237`	`240`	`LiveHandle live_handle(GLStorage{.integer = handle.untracked_id_.value()});`
`238`	`241`	`live_handle.pending_collection = true;`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,8 @@ std::shared_ptr<impeller::Context> AndroidContext::GetImpellerContext() const {`
`50`	`50`	`return impeller_context_;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+bool AndroidContext::IsDynamicSelection() const {`
	`54`	`+ return false;`
	`55`	`+}`
	`56`	`+`
`53`	`57`	`} // namespace flutter`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ void SurfaceTextureExternalTextureGLImpeller::ProcessFrame(`
`55`	`55`
`56`	`56`	`void SurfaceTextureExternalTextureGLImpeller::Detach() {`
`57`	`57`	`SurfaceTextureExternalTexture::Detach();`
	`58`	`+ // Detach will collect the texture handle.`
	`59`	`+ // See also: https://github.com/flutter/flutter/issues/152459`
	`60`	`+ texture_->Leak();`
`58`	`61`	`texture_.reset();`
`59`	`62`	`}`
`60`	`63`