From e1c09f408cf24c30e6534f2d678731e32173799e Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Thu, 5 Dec 2024 12:43:12 -0800
Subject: [PATCH] [flutter_tools] configure shader compiler to output GLES3
 shaders for Android. (#159857)

Required changes for https://github.com/flutter/engine/pull/56960

This configures an additional shader target for Android devices.
---
 .../lib/src/build_system/tools/shader_compiler.dart           | 2 +-
 .../flutter_tools/test/general.shard/asset_bundle_test.dart   | 1 +
 .../test/general.shard/build_system/targets/android_test.dart | 1 +
 .../build_system/targets/shader_compiler_test.dart            | 4 ++++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart b/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart
index bef6474cab..34aaaf812e 100644
--- a/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart
+++ b/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart
@@ -115,7 +115,7 @@ class ShaderCompiler {
       case TargetPlatform.linux_arm64:
       case TargetPlatform.windows_x64:
       case TargetPlatform.windows_arm64:
-        return <String>['--sksl', '--runtime-stage-gles', '--runtime-stage-vulkan'];
+        return <String>['--sksl', '--runtime-stage-gles',  '--runtime-stage-gles3', '--runtime-stage-vulkan'];
 
       case TargetPlatform.ios:
       case TargetPlatform.darwin:
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart
index db5d62822b..cafe2527e4 100644
--- a/packages/flutter_tools/test/general.shard/asset_bundle_test.dart
+++ b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart
@@ -774,6 +774,7 @@ flutter:
             impellerc,
             '--sksl',
             '--runtime-stage-gles',
+            '--runtime-stage-gles3',
             '--runtime-stage-vulkan',
             '--iplr',
             '--sl=$outputPath',
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart
index d0c2c696d1..dde63cd353 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart
@@ -543,6 +543,7 @@ void main() {
         'HostArtifact.impellerc',
         '--sksl',
         '--runtime-stage-gles',
+        '--runtime-stage-gles3',
         '--runtime-stage-vulkan',
         '--iplr',
         '--sl=out/flutter_assets/shader.glsl',
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
index c9abc4187d..6d1e07a28f 100644
--- a/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
+++ b/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart
@@ -124,6 +124,7 @@ void main() {
           impellerc,
           '--sksl',
           '--runtime-stage-gles',
+          '--runtime-stage-gles3',
           '--runtime-stage-vulkan',
           '--iplr',
           '--sl=$outputPath',
@@ -245,6 +246,7 @@ void main() {
           impellerc,
           '--sksl',
           '--runtime-stage-gles',
+          '--runtime-stage-gles3',
           '--runtime-stage-vulkan',
           '--iplr',
           '--sl=/.tmp_rand0/0.8255140718871702.temp',
@@ -337,6 +339,7 @@ void main() {
           impellerc,
           '--sksl',
           '--runtime-stage-gles',
+          '--runtime-stage-gles3',
           '--runtime-stage-vulkan',
           '--iplr',
           '--sl=/.tmp_rand0/0.8255140718871702.temp',
@@ -429,6 +432,7 @@ void main() {
           impellerc,
           '--sksl',
           '--runtime-stage-gles',
+          '--runtime-stage-gles3',
           '--runtime-stage-vulkan',
           '--iplr',
           '--sl=/.tmp_rand0/0.8255140718871702.temp',