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

[Impeller] enable Impeller by default on Android. #53099

Merged
merged 7 commits into from
May 30, 2024
Merged

[Impeller] enable Impeller by default on Android. #53099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c25c81
[IMmeller] enable impeller by default.
May 29, 2024
e4574f0
make enable impeller true or false.
May 29, 2024
e9d80f4
allow opting out of impeller.
May 29, 2024
a7f84b1
++
May 29, 2024
58b974b
fix arguemnt.
May 29, 2024
c23104f
default to --enable-impeller
May 30, 2024
0c87c81
disable it for real.
May 30, 2024
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
2 changes: 1 addition & 1 deletion common/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ struct Settings {

// Enable the Impeller renderer on supported platforms. Ignored if Impeller is
// not supported on the platform.
#if FML_OS_IOS || FML_OS_IOS_SIMULATOR
#if FML_OS_IOS || FML_OS_IOS_SIMULATOR || FML_OS_ANDROID
bool enable_impeller = true;
#else
bool enable_impeller = false;
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class FlutterShellArgs {
public static final String ARG_KEY_TRACE_TO_FILE = "trace-to-file";
public static final String ARG_TRACE_TO_FILE = "--trace-to-file";
public static final String ARG_KEY_ENABLE_IMPELLER = "enable-impeller";
public static final String ARG_ENABLE_IMPELLER = "--enable-impeller";
public static final String ARG_DISABLE_IMPELLER = "--enable-impeller=false";
public static final String ARG_KEY_ENABLE_VULKAN_VALIDATION = "enable-vulkan-validation";
public static final String ARG_ENABLE_VULKAN_VALIDATION = "--enable-vulkan-validation";
public static final String ARG_KEY_DUMP_SHADER_SKP_ON_SHADER_COMPILATION =
Expand Down Expand Up @@ -123,8 +123,8 @@ public static FlutterShellArgs fromIntent(@NonNull Intent intent) {
if (intent.hasExtra(ARG_KEY_TRACE_TO_FILE)) {
args.add(ARG_TRACE_TO_FILE + "=" + intent.getStringExtra(ARG_KEY_TRACE_TO_FILE));
}
if (intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, false)) {
args.add(ARG_ENABLE_IMPELLER);
if (!intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, true)) {
args.add(ARG_DISABLE_IMPELLER);
}
if (intent.getBooleanExtra(ARG_KEY_ENABLE_VULKAN_VALIDATION, false)) {
args.add(ARG_ENABLE_VULKAN_VALIDATION);
Expand Down
2 changes: 2 additions & 0 deletions testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public void onCreate(@Nullable Bundle arguments) {
"--enable-impeller=true",
"--impeller-backend=" + arguments.getString("impeller-backend", "vulkan")
};
} else {
engineArguments = new String[]{"--enable-impeller=false"};
}
FlutterRenderer.debugDisableSurfaceClear = true;
if ("true".equals(arguments.getString("force-surface-producer-surface-texture"))) {
Expand Down
4 changes: 3 additions & 1 deletion testing/scenario_app/bin/run_android_tests.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,9 @@ Future<void> _run({
if (smokeTestFullPath != null)
'-e class $smokeTestFullPath',
if (enableImpeller)
'-e enable-impeller true',
'-e enable-impeller true'
else
'-e enable-impeller false',
if (impellerBackend != null)
'-e impeller-backend ${impellerBackend.name}',
if (forceSurfaceProducerSurfaceTexture)
Expand Down