Merge branch 'main' of github.com:flutter/engine into use_r8_everywhere

impeller/renderer/backend/gles/capabilities_gles.cc

@@ -197,8 +197,13 @@ PixelFormat CapabilitiesGLES::GetDefaultDepthStencilFormat() const {
   return PixelFormat::kD24UnormS8Uint;
 }
 
+<<<<<<< HEAD
 PixelFormat CapabilitiesGLES::GetDefaultGlyphAtlasFormat() const {
   return default_glyph_atlas_format_;
+=======
+bool CapabilitiesGLES::IsANGLE() const {
+  return is_angle_;
+>>>>>>> 9b183870ff6ce2f928e86b45d82e06ddcef28423
 }
 
 }  // namespace impeller

impeller/renderer/backend/gles/capabilities_gles.h

@@ -127,7 +127,7 @@ class CapabilitiesGLES final
   bool supports_decal_sampler_address_mode_ = false;
   bool supports_offscreen_msaa_ = false;
   bool supports_implicit_msaa_ = false;
-
+  bool is_angle_ = false;
   PixelFormat default_glyph_atlas_format_ = PixelFormat::kUnknown;
 };