[Impeller] remove unused shader, format malioc diff (flutter#40230)

[Impeller] remove unused shader, format malioc diff
jonahwilliams · Mar 10, 2023 · 3b07c4c · 3b07c4c
1 parent 9270e3d
commit 3b07c4c
Show file tree

Hide file tree

Showing 8 changed files with 7,431 additions and 38 deletions.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -1251,7 +1251,6 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.frag + ..
 ORIGIN: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.vert + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/morphology_filter.frag + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/morphology_filter.vert + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/entity/shaders/position.vert + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/position_color.vert + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/position_uv.vert + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/entity/shaders/radial_gradient_fill.frag + ../../../flutter/LICENSE
@@ -3781,7 +3780,6 @@ FILE: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.frag
 FILE: ../../../flutter/impeller/entity/shaders/linear_to_srgb_filter.vert
 FILE: ../../../flutter/impeller/entity/shaders/morphology_filter.frag
 FILE: ../../../flutter/impeller/entity/shaders/morphology_filter.vert
-FILE: ../../../flutter/impeller/entity/shaders/position.vert
 FILE: ../../../flutter/impeller/entity/shaders/position_color.vert
 FILE: ../../../flutter/impeller/entity/shaders/position_uv.vert
 FILE: ../../../flutter/impeller/entity/shaders/radial_gradient_fill.frag

diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn
@@ -45,7 +45,6 @@ impeller_shaders("entity_shaders") {
     "shaders/morphology_filter.vert",
     "shaders/position_color.vert",
     "shaders/position_uv.vert",
-    "shaders/position.vert",
     "shaders/radial_gradient_fill.frag",
     "shaders/rrect_blur.vert",
     "shaders/rrect_blur.frag",

diff --git a/impeller/entity/contents/content_context.cc b/impeller/entity/contents/content_context.cc
@@ -276,8 +276,6 @@ ContentContext::ContentContext(std::shared_ptr<Context> context)
       CreateDefaultPipeline<GlyphAtlasSdfPipeline>(*context_);
   geometry_color_pipelines_[{}] =
       CreateDefaultPipeline<GeometryColorPipeline>(*context_);
-  geometry_position_pipelines_[{}] =
-      CreateDefaultPipeline<GeometryPositionPipeline>(*context_);
   yuv_to_rgb_filter_pipelines_[{}] =
       CreateDefaultPipeline<YUVToRGBFilterPipeline>(*context_);
 

diff --git a/impeller/entity/contents/content_context.h b/impeller/entity/contents/content_context.h
@@ -52,7 +52,6 @@
 #include "impeller/renderer/pipeline.h"
 #include "impeller/scene/scene_context.h"
 
-#include "impeller/entity/position.vert.h"
 #include "impeller/entity/position_color.vert.h"
 
 #include "impeller/scene/scene_context.h"
@@ -152,8 +151,6 @@ using GlyphAtlasSdfPipeline =
 using ClipPipeline =
     RenderPipelineT<SolidFillVertexShader, SolidFillFragmentShader>;
 
-using GeometryPositionPipeline =
-    RenderPipelineT<PositionVertexShader, VerticesFragmentShader>;
 using GeometryColorPipeline =
     RenderPipelineT<PositionColorVertexShader, VerticesFragmentShader>;
 using YUVToRGBFilterPipeline =
@@ -427,11 +424,6 @@ class ContentContext {
     return GetPipeline(geometry_color_pipelines_, opts);
   }
 
-  std::shared_ptr<Pipeline<PipelineDescriptor>> GetGeometryPositionPipeline(
-      ContentContextOptions opts) const {
-    return GetPipeline(geometry_position_pipelines_, opts);
-  }
-
   std::shared_ptr<Pipeline<PipelineDescriptor>> GetYUVToRGBFilterPipeline(
       ContentContextOptions opts) const {
     return GetPipeline(yuv_to_rgb_filter_pipelines_, opts);
@@ -661,7 +653,6 @@ class ContentContext {
   mutable Variants<ClipPipeline> clip_pipelines_;
   mutable Variants<GlyphAtlasPipeline> glyph_atlas_pipelines_;
   mutable Variants<GlyphAtlasSdfPipeline> glyph_atlas_sdf_pipelines_;
-  mutable Variants<GeometryPositionPipeline> geometry_position_pipelines_;
   mutable Variants<GeometryColorPipeline> geometry_color_pipelines_;
   mutable Variants<YUVToRGBFilterPipeline> yuv_to_rgb_filter_pipelines_;
   // Advanced blends.

diff --git a/impeller/entity/contents/vertices_contents.cc b/impeller/entity/contents/vertices_contents.cc
@@ -8,7 +8,6 @@
 #include "impeller/entity/contents/filters/color_filter_contents.h"
 #include "impeller/entity/contents/filters/filter_contents.h"
 #include "impeller/entity/contents/texture_contents.h"
-#include "impeller/entity/position.vert.h"
 #include "impeller/entity/position_color.vert.h"
 #include "impeller/entity/vertices.frag.h"
 #include "impeller/geometry/color.h"

diff --git a/impeller/entity/shaders/position.vert b/impeller/entity/shaders/position.vert
diff --git a/impeller/tools/malioc.json b/impeller/tools/malioc.json
diff --git a/impeller/tools/malioc_diff.py b/impeller/tools/malioc_diff.py
@@ -119,6 +119,8 @@ def read_malioc_file(malioc_tree, json_file):
     filename = os.path.relpath(shader['filename'], build_gen_dir)
     if filename.startswith('../..'):
       filename = filename[6:]
+    if filename.startswith('../'):
+      filename = filename[3:]
     result['filename'] = filename
     result['core'] = shader['hardware']['core']
     result['type'] = shader['shader']['type']
@@ -266,7 +268,7 @@ def main(argv):
   if args.update:
     # Write the new results to the file given by --before, then exit.
     with open(args.before, 'w') as file:
-      json.dump(after_json, file, sort_keys=True)
+      json.dump(after_json, file, sort_keys=True, indent=2)
     return 0
 
   with open(args.before, 'r') as file: