diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index dc9bf5e4a8..3c2837c9a5 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -665,8 +665,6 @@ class AndroidDevice extends Device { ...['--ez', 'enable-impeller', 'false'], if (debuggingOptions.enableVulkanValidation) ...['--ez', 'enable-vulkan-validation', 'true'], - if (debuggingOptions.impellerForceGL) - ...['--ez', 'impeller-force-gl', 'true'], if (debuggingOptions.debuggingEnabled) ...[ if (debuggingOptions.buildInfo.isDebug) ...[ ...['--ez', 'enable-checked-mode', 'true'], diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index f63e0429d8..7236d3f5b5 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart @@ -195,7 +195,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment usesFatalWarningsOption(verboseHelp: verboseHelp); addEnableImpellerFlag(verboseHelp: verboseHelp); addEnableVulkanValidationFlag(verboseHelp: verboseHelp); - addImpellerForceGLFlag(verboseHelp: verboseHelp); addEnableEmbedderApiFlag(verboseHelp: verboseHelp); } @@ -210,7 +209,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment bool get trackWidgetCreation => boolArg('track-widget-creation'); ImpellerStatus get enableImpeller => ImpellerStatus.fromBool(argResults!['enable-impeller'] as bool?); bool get enableVulkanValidation => boolArg('enable-vulkan-validation'); - bool get impellerForceGL => boolArg('impeller-force-gl'); bool get uninstallFirst => boolArg('uninstall-first'); bool get enableEmbedderApi => boolArg('enable-embedder-api'); @@ -261,7 +259,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment webHeaders: webHeaders, enableImpeller: enableImpeller, enableVulkanValidation: enableVulkanValidation, - impellerForceGL: impellerForceGL, uninstallFirst: uninstallFirst, enableDartProfiling: enableDartProfiling, enableEmbedderApi: enableEmbedderApi, @@ -316,7 +313,6 @@ abstract class RunCommandBase extends FlutterCommand with DeviceBasedDevelopment nativeNullAssertions: boolArg('native-null-assertions'), enableImpeller: enableImpeller, enableVulkanValidation: enableVulkanValidation, - impellerForceGL: impellerForceGL, uninstallFirst: uninstallFirst, serveObservatory: boolArg('serve-observatory'), enableDartProfiling: enableDartProfiling, diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart index 3de2799072..a4ccc3e13b 100644 --- a/packages/flutter_tools/lib/src/device.dart +++ b/packages/flutter_tools/lib/src/device.dart @@ -955,7 +955,6 @@ class DebuggingOptions { this.nativeNullAssertions = false, this.enableImpeller = ImpellerStatus.platformDefault, this.enableVulkanValidation = false, - this.impellerForceGL = false, this.uninstallFirst = false, this.serveObservatory = false, this.enableDartProfiling = true, @@ -982,7 +981,6 @@ class DebuggingOptions { this.traceAllowlist, this.enableImpeller = ImpellerStatus.platformDefault, this.enableVulkanValidation = false, - this.impellerForceGL = false, this.uninstallFirst = false, this.enableDartProfiling = true, this.enableEmbedderApi = false, @@ -1063,7 +1061,6 @@ class DebuggingOptions { required this.nativeNullAssertions, required this.enableImpeller, required this.enableVulkanValidation, - required this.impellerForceGL, required this.uninstallFirst, required this.serveObservatory, required this.enableDartProfiling, @@ -1108,7 +1105,6 @@ class DebuggingOptions { final bool webUseSseForInjectedClient; final ImpellerStatus enableImpeller; final bool enableVulkanValidation; - final bool impellerForceGL; final bool serveObservatory; final bool enableDartProfiling; final bool enableEmbedderApi; @@ -1255,7 +1251,6 @@ class DebuggingOptions { 'nativeNullAssertions': nativeNullAssertions, 'enableImpeller': enableImpeller.asBool, 'enableVulkanValidation': enableVulkanValidation, - 'impellerForceGL': impellerForceGL, 'serveObservatory': serveObservatory, 'enableDartProfiling': enableDartProfiling, 'enableEmbedderApi': enableEmbedderApi, @@ -1310,7 +1305,6 @@ class DebuggingOptions { nativeNullAssertions: json['nativeNullAssertions']! as bool, enableImpeller: ImpellerStatus.fromBool(json['enableImpeller'] as bool?), enableVulkanValidation: (json['enableVulkanValidation'] as bool?) ?? false, - impellerForceGL: (json['impellerForceGL'] as bool?) ?? false, uninstallFirst: (json['uninstallFirst'] as bool?) ?? false, serveObservatory: (json['serveObservatory'] as bool?) ?? false, enableDartProfiling: (json['enableDartProfiling'] as bool?) ?? true, diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 1e47503ec8..c79ace8082 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -1141,16 +1141,6 @@ abstract class FlutterCommand extends Command { ); } - void addImpellerForceGLFlag({required bool verboseHelp}) { - argParser.addFlag('impeller-force-gl', - hide: !verboseHelp, - help: 'On platforms that support OpenGL Rendering using Impeller, force ' - 'rendering using OpenGL over other APIs. If Impeller is not ' - 'enabled or the platform does not support OpenGL ES, this flag ' - 'does nothing.', - ); - } - void addEnableEmbedderApiFlag({required bool verboseHelp}) { argParser.addFlag('enable-embedder-api', hide: !verboseHelp, diff --git a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart index 2307c1e350..44023e517a 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart @@ -1227,7 +1227,6 @@ void main() { '--native-null-assertions', '--enable-impeller', '--enable-vulkan-validation', - '--impeller-force-gl', '--trace-systrace', '--enable-software-rendering', '--skia-deterministic-rendering', @@ -1249,7 +1248,6 @@ void main() { expect(options.traceSystrace, true); expect(options.enableImpeller, ImpellerStatus.enabled); expect(options.enableVulkanValidation, true); - expect(options.impellerForceGL, true); expect(options.enableSoftwareRendering, true); expect(options.skiaDeterministicRendering, true); expect(options.usingCISystem, true);