Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[flutter roll cp][Impeller] Only allow Impeller in flutter_tester if vulkan is enabled… #46904

Closed
XilaiZhang wants to merge 1 commit into from
Closed

[flutter roll cp][Impeller] Only allow Impeller in flutter_tester if vulkan is enabled… #46904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions shell/testing/tester_main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
#include "third_party/dart/runtime/include/dart_api.h"
#include "third_party/skia/include/core/SkSurface.h"

#if IMPELLER_SUPPORTS_RENDERING
// Impeller should only be enabled if the Vulkan backend is enabled.
#define ALLOW_IMPELLER (IMPELLER_SUPPORTS_RENDERING && IMPELLER_ENABLE_VULKAN)

#if ALLOW_IMPELLER
#include <vulkan/vulkan.h> // nogncheck
#include "flutter/vulkan/procs/vulkan_proc_table.h" // nogncheck
#include "flutter/vulkan/swiftshader_path.h" // nogncheck
Expand Down Expand Up @@ -128,7 +131,7 @@ class TesterPlatformView : public PlatformView,
impeller_context_holder_(std::move(impeller_context_holder)) {}

~TesterPlatformView() {
#if IMPELLER_SUPPORTS_RENDERING
#if ALLOW_IMPELLER
if (impeller_context_holder_.context) {
impeller_context_holder_.context->Shutdown();
}
Expand All @@ -137,25 +140,25 @@ class TesterPlatformView : public PlatformView,

// |PlatformView|
std::shared_ptr<impeller::Context> GetImpellerContext() const override {
#if IMPELLER_SUPPORTS_RENDERING
#if ALLOW_IMPELLER
return std::static_pointer_cast<impeller::Context>(
impeller_context_holder_.context);
#else
return nullptr;
#endif // IMPELLER_SUPPORTS_RENDERING
#endif // ALLOW_IMPELLER
}

// |PlatformView|
std::unique_ptr<Surface> CreateRenderingSurface() override {
#if IMPELLER_SUPPORTS_RENDERING
#if ALLOW_IMPELLER
if (delegate_.OnPlatformViewGetSettings().enable_impeller) {
FML_DCHECK(impeller_context_holder_.context);
auto surface = std::make_unique<GPUSurfaceVulkanImpeller>(
impeller_context_holder_.surface_context);
FML_DCHECK(surface->IsValid());
return surface;
}
#endif // IMPELLER_SUPPORTS_RENDERING
#endif // ALLOW_IMPELLER
auto surface = std::make_unique<TesterGPUSurfaceSoftware>(
this, true /* render to surface */);
FML_DCHECK(surface->IsValid());
Expand Down Expand Up @@ -308,7 +311,7 @@ int RunTester(const flutter::Settings& settings,

ImpellerVulkanContextHolder impeller_context_holder;

#if IMPELLER_SUPPORTS_RENDERING
#if ALLOW_IMPELLER
if (settings.enable_impeller) {
impeller_context_holder.vulkan_proc_table =
fml::MakeRefCounted<vulkan::VulkanProcTable>(VULKAN_SO_PATH);
Expand Down Expand Up @@ -356,7 +359,7 @@ int RunTester(const flutter::Settings& settings,
return EXIT_FAILURE;
}
}
#endif // IMPELLER_SUPPORTS_RENDERING
#endif // ALLOW_IMPELLER

Shell::CreateCallback<PlatformView> on_create_platform_view =
[impeller_context_holder =
Expand Down