firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[android] correct API availibility checks for hcpp. (#163226)

Browse Source 
This fixes the HCPP crashes in devicelab by correctly disabling HCPP for
devices that are < API level 34. Unfortunately this means we can't
benchmark on CI until we update the devices.
This commit is contained in:
Jonah Williams 2025-02-13 09:39:48 -08:00 committed by GitHub
parent 4ff2deafd4
commit 1cd3ab16ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/src/flutter/impeller/renderer/backend/vulkan/swapchain/swapchain_vk.cc
View File

@ -59,7 +59,8 @@ std::shared_ptr<SwapchainVK> SwapchainVK::Create(
// Use AHB Swapchains if they are opted in. // Use AHB Swapchains if they are opted in.
if (ContextVK::Cast(*context).GetShouldEnableSurfaceControlSwapchain() && if (ContextVK::Cast(*context).GetShouldEnableSurfaceControlSwapchain() &&
AHBSwapchainVK::IsAvailableOnPlatform()) { AHBSwapchainVK::IsAvailableOnPlatform() &&
android_get_device_api_level() >= 34) {
FML_LOG(WARNING) << "Using Android SurfaceControl Swapchain."; FML_LOG(WARNING) << "Using Android SurfaceControl Swapchain.";
auto ahb_swapchain = std::shared_ptr<AHBSwapchainVK>(new AHBSwapchainVK( auto ahb_swapchain = std::shared_ptr<AHBSwapchainVK>(new AHBSwapchainVK(
context, // context, //

6
engine/src/flutter/shell/platform/android/platform_view_android.cc
View File

@ -136,13 +136,13 @@ PlatformViewAndroid::PlatformViewAndroid(
delegate.OnPlatformViewGetSettings().enable_impeller // delegate.OnPlatformViewGetSettings().enable_impeller //
); );
android_surface_ = surface_factory_->CreateSurface(); android_surface_ = surface_factory_->CreateSurface();
// TODO(jonahwilliams): we need to expose the runtime check for the
// correct extensions and allowlist for this to work correctly.
android_use_new_platform_view_ = android_use_new_platform_view_ =
android_context->RenderingApi() == android_context->RenderingApi() ==
AndroidRenderingAPI::kImpellerVulkan && AndroidRenderingAPI::kImpellerVulkan &&
(android_get_device_api_level() >= kMinAPILevelHCPP) && (android_get_device_api_level() >= kMinAPILevelHCPP) &&
delegate.OnPlatformViewGetSettings().enable_surface_control; delegate.OnPlatformViewGetSettings().enable_surface_control &&
impeller::ContextVK::Cast(*android_context->GetImpellerContext())
.GetShouldEnableSurfaceControlSwapchain();
FML_CHECK(android_surface_ && android_surface_->IsValid()) FML_CHECK(android_surface_ && android_surface_->IsValid())
<< "Could not create an OpenGL, Vulkan or Software surface to set " << "Could not create an OpenGL, Vulkan or Software surface to set "
"up " "up "