[Impeller] Format shader sources. (#37770)

* Update format.dart to include glsl, format repo

* format more

Author: dnfield

ci/bin/format.dart

@@ -71,7 +71,7 @@ FormatCheck nameToFormatCheck(String name) {
 String formatCheckToName(FormatCheck check) {
   switch (check) {
     case FormatCheck.clang:
-      return 'C++/ObjC';
+      return 'C++/ObjC/Shader';
     case FormatCheck.gn:
       return 'GN';
     case FormatCheck.java:
@@ -301,7 +301,7 @@ abstract class FormatChecker {
   }
 }
 
-/// Checks and formats C++/ObjC files using clang-format.
+/// Checks and formats C++/ObjC/Shader files using clang-format.
 class ClangFormatChecker extends FormatChecker {
   ClangFormatChecker({
     ProcessManager processManager = const LocalProcessManager(),
@@ -350,7 +350,7 @@ class ClangFormatChecker extends FormatChecker {
 
   @override
   Future<bool> fixFormatting() async {
-    message('Fixing C++/ObjC formatting...');
+    message('Fixing C++/ObjC/Shader formatting...');
     final List<String> failures = await _getCFormatFailures(fixing: true);
     if (failures.isEmpty) {
       return true;
@@ -365,7 +365,7 @@ class ClangFormatChecker extends FormatChecker {
   }
 
   Future<List<String>> _getCFormatFailures({bool fixing = false}) async {
-    message('Checking C++/ObjC formatting...');
+    message('Checking C++/ObjC/Shader formatting...');
     const List<String> clangFiletypes = <String>[
       '*.c',
       '*.cc',
@@ -374,10 +374,17 @@ class ClangFormatChecker extends FormatChecker {
       '*.h',
       '*.m',
       '*.mm',
+      '*.glsl',
+      '*.hlsl',
+      '*.comp',
+      '*.tese',
+      '*.tesc',
+      '*.vert',
+      '*.frag',
     ];
     final List<String> files = await getFileList(clangFiletypes);
     if (files.isEmpty) {
-      message('No C++/ObjC files with changes, skipping C++/ObjC format check.');
+      message('No C++/ObjC/Shader files with changes, skipping C++/ObjC/Shader format check.');
       return <String>[];
     }
     if (verbose) {
@@ -416,10 +423,10 @@ class ClangFormatChecker extends FormatChecker {
     if (failed.isNotEmpty) {
       final bool plural = failed.length > 1;
       if (fixing) {
-        message('Fixing ${failed.length} C++/ObjC file${plural ? 's' : ''}'
+        message('Fixing ${failed.length} C++/ObjC/Shader file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
       } else {
-        error('Found ${failed.length} C++/ObjC file${plural ? 's' : ''}'
+        error('Found ${failed.length} C++/ObjC/Shader file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
         stdout.writeln('To fix, run:');
         stdout.writeln();
@@ -431,7 +438,7 @@ class ClangFormatChecker extends FormatChecker {
         stdout.writeln();
       }
     } else {
-      message('Completed checking ${diffJobs.length} C++/ObjC files with no formatting problems.');
+      message('Completed checking ${diffJobs.length} C++/ObjC/Shader files with no formatting problems.');
     }
     return failed.map<String>((WorkerJob job) {
       return job.result.stdout;

impeller/compiler/shader_lib/impeller/texture.glsl

@@ -24,8 +24,12 @@ vec4 IPSample(sampler2D texture_sampler, vec2 coords, float y_coord_scale) {
 /// If `y_coord_scale` < 0.0, the Y coordinate is flipped. This is useful
 /// for Impeller graphics backends that use a flipped framebuffer coordinate
 /// space.
-/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 - half_texel]
-vec4 IPSampleLinear(sampler2D texture_sampler, vec2 coords, float y_coord_scale, vec2 half_texel) {
+/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 -
+/// half_texel]
+vec4 IPSampleLinear(sampler2D texture_sampler,
+                    vec2 coords,
+                    float y_coord_scale,
+                    vec2 half_texel) {
   coords.x = mix(half_texel.x, 1 - half_texel.x, coords.x);
   coords.y = mix(half_texel.y, 1 - half_texel.y, coords.y);
   return IPSample(texture_sampler, coords, y_coord_scale);
@@ -79,7 +83,8 @@ vec4 IPSampleWithTileMode(sampler2D tex,
     return vec4(0);
   }
 
-  return IPSample(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode), y_coord_scale);
+  return IPSample(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode),
+                  y_coord_scale);
 }
 
 /// Sample a texture, emulating a specific tile mode.
@@ -97,7 +102,8 @@ vec4 IPSampleWithTileMode(sampler2D tex,
 ///
 /// This is useful for Impeller graphics backend that don't have native support
 /// for Decal.
-/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 - half_texel]
+/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 -
+/// half_texel]
 vec4 IPSampleLinearWithTileMode(sampler2D tex,
                                 vec2 coords,
                                 float y_coord_scale,
@@ -109,20 +115,23 @@ vec4 IPSampleLinearWithTileMode(sampler2D tex,
     return vec4(0);
   }
 
-  return IPSampleLinear(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode), y_coord_scale, half_texel);
+  return IPSampleLinear(tex, IPVec2Tile(coords, x_tile_mode, y_tile_mode),
+                        y_coord_scale, half_texel);
 }
 
 /// Sample a texture, emulating a specific tile mode.
 ///
 /// This is useful for Impeller graphics backend that don't have native support
 /// for Decal.
-/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 - half_texel]
+/// The range of `coods` will be mapped from [0, 1] to [half_texel, 1 -
+/// half_texel]
 vec4 IPSampleLinearWithTileMode(sampler2D tex,
                                 vec2 coords,
                                 float y_coord_scale,
                                 vec2 half_texel,
                                 float tile_mode) {
-  return IPSampleLinearWithTileMode(tex, coords, y_coord_scale, half_texel, tile_mode, tile_mode);
+  return IPSampleLinearWithTileMode(tex, coords, y_coord_scale, half_texel,
+                                    tile_mode, tile_mode);
 }
 
 #endif

impeller/entity/shaders/blending/advanced_blend.glsl

@@ -12,7 +12,8 @@ uniform BlendInfo {
   float src_y_coord_scale;
   float color_factor;
   vec4 color;  // This color input is expected to be unpremultiplied.
-} blend_info;
+}
+blend_info;
 
 uniform sampler2D texture_sampler_dst;
 uniform sampler2D texture_sampler_src;
@@ -28,7 +29,8 @@ void main() {
                            v_dst_texture_coords,          // texture coordinates
                            blend_info.dst_y_coord_scale,  // y coordinate scale
                            kTileModeDecal                 // tile mode
-      ) * blend_info.dst_input_alpha;
+                           ) *
+      blend_info.dst_input_alpha;
 
   vec4 dst = IPUnpremultiply(dst_sample);
   vec4 src = blend_info.color_factor > 0
@@ -43,5 +45,5 @@ void main() {
   vec4 blended = vec4(Blend(dst.rgb, src.rgb), 1) * dst.a;
 
   frag_color = mix(dst_sample, blended, src.a);
-  //frag_color = dst_sample;
+  // frag_color = dst_sample;
 }

impeller/entity/shaders/blending/blend.frag

@@ -9,7 +9,8 @@ uniform sampler2D texture_sampler_src;
 uniform FragInfo {
   float texture_sampler_y_coord_scale;
   float input_alpha;
-} frag_info;
+}
+frag_info;
 
 in vec2 v_texture_coords;
 
@@ -18,5 +19,5 @@ out vec4 frag_color;
 void main() {
   frag_color = IPSample(texture_sampler_src, v_texture_coords,
                         frag_info.texture_sampler_y_coord_scale) *
-                   frag_info.input_alpha;
+               frag_info.input_alpha;
 }

impeller/entity/shaders/blending/blend.vert

@@ -4,7 +4,8 @@
 
 uniform FrameInfo {
   mat4 mvp;
-} frame_info;
+}
+frame_info;
 
 in vec2 vertices;
 in vec2 texture_coords;

impeller/entity/shaders/border_mask_blur.frag

@@ -18,7 +18,8 @@ uniform sampler2D texture_sampler;
 
 uniform FragInfo {
   float texture_sampler_y_coord_scale;
-} frag_info;
+}
+frag_info;
 
 in vec2 v_texture_coords;
 in vec2 v_sigma_uv;

impeller/entity/shaders/color_matrix_color_filter.frag

@@ -7,7 +7,8 @@
 
 // A color filter that transforms colors through a 4x5 color matrix.
 //
-// This filter can be used to change the saturation of pixels, convert from YUV to RGB, etc.
+// This filter can be used to change the saturation of pixels, convert from YUV
+// to RGB, etc.
 //
 // 4x5 matrix for transforming the color and alpha components of a Bitmap.
 // The matrix can be passed as single array, and is treated as follows:
@@ -24,14 +25,16 @@
 //    B’ = k*R + l*G + m*B + n*A + o;
 //    A’ = p*R + q*G + r*B + s*A + t;
 //
-// That resulting color [R’, G’, B’, A’] then has each channel clamped to the 0 to 255 range.
+// That resulting color [R’, G’, B’, A’] then has each channel clamped to the 0
+// to 255 range.
 
 uniform FragInfo {
   mat4 color_m;
   vec4 color_v;
   float texture_sampler_y_coord_scale;
   float input_alpha;
-} frag_info;
+}
+frag_info;
 
 uniform sampler2D input_texture;
 
@@ -41,14 +44,13 @@ out vec4 frag_color;
 void main() {
   vec4 input_color = IPSample(input_texture, v_position,
                               frag_info.texture_sampler_y_coord_scale) *
-                         frag_info.input_alpha;
-
+                     frag_info.input_alpha;
 
   // unpremultiply first, as filter inputs are premultiplied.
   vec4 color = IPUnpremultiply(input_color);
 
   color = clamp(frag_info.color_m * color + frag_info.color_v, 0.0, 1.0);
-  
+
   // premultiply the outputs
   frag_color = vec4(color.rgb * color.a, color.a);
 }

impeller/entity/shaders/color_matrix_color_filter.vert

@@ -4,7 +4,8 @@
 
 uniform FrameInfo {
   mat4 mvp;
-} frame_info;
+}
+frame_info;
 
 in vec2 position;
 out vec2 v_position;

impeller/entity/shaders/gradient_fill.vert

@@ -7,7 +7,8 @@
 uniform FrameInfo {
   mat4 mvp;
   mat4 matrix;
-} frame_info;
+}
+frame_info;
 
 in vec2 position;
 

impeller/entity/shaders/linear_gradient_fill.frag

@@ -13,24 +13,22 @@ uniform GradientInfo {
   float texture_sampler_y_coord_scale;
   float alpha;
   vec2 half_texel;
-} gradient_info;
+}
+gradient_info;
 
 in vec2 v_position;
 
 out vec4 frag_color;
 
 void main() {
   float len = length(gradient_info.end_point - gradient_info.start_point);
-  float dot = dot(
-    v_position - gradient_info.start_point,
-    gradient_info.end_point - gradient_info.start_point
-  );
+  float dot = dot(v_position - gradient_info.start_point,
+                  gradient_info.end_point - gradient_info.start_point);
   float t = dot / (len * len);
   frag_color = IPSampleLinearWithTileMode(
-    texture_sampler,
-    vec2(t, 0.5),
-    gradient_info.texture_sampler_y_coord_scale,
-    gradient_info.half_texel,
-    gradient_info.tile_mode);
-  frag_color = vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
+      texture_sampler, vec2(t, 0.5),
+      gradient_info.texture_sampler_y_coord_scale, gradient_info.half_texel,
+      gradient_info.tile_mode);
+  frag_color =
+      vec4(frag_color.xyz * frag_color.a, frag_color.a) * gradient_info.alpha;
 }