From 3c25c81aeb45ed2cc6f26c83042114b96bd11c1d Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 14:22:28 -0700 Subject: [PATCH 1/7] [IMmeller] enable impeller by default. --- common/settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/settings.h b/common/settings.h index b2872abdcd33b..ef3de3d0b595a 100644 --- a/common/settings.h +++ b/common/settings.h @@ -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; From e4574f0ba0344bfbaa45f7774b1fc090ced7e24f Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 14:56:25 -0700 Subject: [PATCH 2/7] make enable impeller true or false. --- testing/scenario_app/bin/run_android_tests.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testing/scenario_app/bin/run_android_tests.dart b/testing/scenario_app/bin/run_android_tests.dart index 51635d9fbe629..75982fdc1b183 100644 --- a/testing/scenario_app/bin/run_android_tests.dart +++ b/testing/scenario_app/bin/run_android_tests.dart @@ -417,7 +417,9 @@ Future _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) From e9d80f4a44b7bb2b90ca35af4e49d3df03bf6f3c Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 16:15:40 -0700 Subject: [PATCH 3/7] allow opting out of impeller. --- .../android/io/flutter/embedding/engine/FlutterShellArgs.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java index 36a40d3923295..a08627ddeb963 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java @@ -46,6 +46,7 @@ public class FlutterShellArgs { 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"; 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 = @@ -125,6 +126,8 @@ public static FlutterShellArgs fromIntent(@NonNull Intent intent) { } if (intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, false)) { args.add(ARG_ENABLE_IMPELLER); + } else { + args.add(ARG_DISABLE_IMPELLER); } if (intent.getBooleanExtra(ARG_KEY_ENABLE_VULKAN_VALIDATION, false)) { args.add(ARG_ENABLE_VULKAN_VALIDATION); From a7f84b1f5c8451e414a21dd4b00cc5a38a5bf3b3 Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 16:20:54 -0700 Subject: [PATCH 4/7] ++ --- .../android/io/flutter/embedding/engine/FlutterShellArgs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java index a08627ddeb963..7b510cacf921b 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java @@ -46,7 +46,7 @@ public class FlutterShellArgs { 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"; + public static final String ARG_DISABLE_IMPELLER = "--no-enable-impeller"; 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 = From 58b974b9e3a6d30140b5e862ff333715b77ad080 Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 16:29:47 -0700 Subject: [PATCH 5/7] fix arguemnt. --- .../android/io/flutter/embedding/engine/FlutterShellArgs.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java index 7b510cacf921b..cea41d2c2078e 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java @@ -45,8 +45,8 @@ 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 = "--no-enable-impeller"; + public static final String ARG_ENABLE_IMPELLER = "--enable-impeller=true"; + 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 = From c23104fef98fa5637bb0f5601227bbf2994849ed Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 17:06:31 -0700 Subject: [PATCH 6/7] default to --enable-impeller --- .../io/flutter/embedding/engine/FlutterShellArgs.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java index cea41d2c2078e..54657e9949a0e 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java @@ -45,7 +45,6 @@ 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=true"; 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"; @@ -124,9 +123,7 @@ 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); - } else { + if (!intent.getBooleanExtra(ARG_KEY_ENABLE_IMPELLER, true)) { args.add(ARG_DISABLE_IMPELLER); } if (intent.getBooleanExtra(ARG_KEY_ENABLE_VULKAN_VALIDATION, false)) { From 0c87c81a6f54d61c9d15ead13d2549aa40e60dca Mon Sep 17 00:00:00 2001 From: jonahwilliams Date: Wed, 29 May 2024 17:38:04 -0700 Subject: [PATCH 7/7] disable it for real. --- .../app/src/androidTest/java/dev/flutter/TestRunner.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java index 1bf2781123255..dccd0864a50d9 100644 --- a/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java +++ b/testing/scenario_app/android/app/src/androidTest/java/dev/flutter/TestRunner.java @@ -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"))) {