diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index a228e44804e0e..614641afcc0e1 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -40501,7 +40501,6 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/gradients/radial_gradient_fill. ORIGIN: ../../../flutter/impeller/entity/shaders/gradients/radial_gradient_ssbo_fill.frag + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/gradients/sweep_gradient_fill.frag + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/gradients/sweep_gradient_ssbo_fill.frag + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/entity/shaders/position_color.vert + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/rrect_blur.frag + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/rrect_blur.vert + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/runtime_effect.vert + ../../../flutter/LICENSE @@ -40513,7 +40512,6 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/texture_fill_strict_src.frag + ORIGIN: ../../../flutter/impeller/entity/shaders/texture_uv_fill.vert + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/tiled_texture_fill.frag + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/entity/shaders/tiled_texture_fill_external.frag + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/entity/shaders/vertices.frag + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/geometry/color.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/geometry/color.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/geometry/constants.cc + ../../../flutter/LICENSE @@ -43379,7 +43377,6 @@ FILE: ../../../flutter/impeller/entity/shaders/gradients/radial_gradient_fill.fr FILE: ../../../flutter/impeller/entity/shaders/gradients/radial_gradient_ssbo_fill.frag FILE: ../../../flutter/impeller/entity/shaders/gradients/sweep_gradient_fill.frag FILE: ../../../flutter/impeller/entity/shaders/gradients/sweep_gradient_ssbo_fill.frag -FILE: ../../../flutter/impeller/entity/shaders/position_color.vert FILE: ../../../flutter/impeller/entity/shaders/rrect_blur.frag FILE: ../../../flutter/impeller/entity/shaders/rrect_blur.vert FILE: ../../../flutter/impeller/entity/shaders/runtime_effect.vert @@ -43391,7 +43388,6 @@ FILE: ../../../flutter/impeller/entity/shaders/texture_fill_strict_src.frag FILE: ../../../flutter/impeller/entity/shaders/texture_uv_fill.vert FILE: ../../../flutter/impeller/entity/shaders/tiled_texture_fill.frag FILE: ../../../flutter/impeller/entity/shaders/tiled_texture_fill_external.frag -FILE: ../../../flutter/impeller/entity/shaders/vertices.frag FILE: ../../../flutter/impeller/geometry/color.cc FILE: ../../../flutter/impeller/geometry/color.h FILE: ../../../flutter/impeller/geometry/constants.cc diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn index 7508cc066fa32..c4c52d244c590 100644 --- a/impeller/entity/BUILD.gn +++ b/impeller/entity/BUILD.gn @@ -24,7 +24,6 @@ impeller_shaders("entity_shaders") { "shaders/glyph_atlas.vert", "shaders/gradients/gradient_fill.vert", "shaders/gradients/linear_gradient_fill.frag", - "shaders/position_color.vert", "shaders/gradients/radial_gradient_fill.frag", "shaders/rrect_blur.vert", "shaders/rrect_blur.frag", @@ -38,7 +37,6 @@ impeller_shaders("entity_shaders") { "shaders/tiled_texture_fill.frag", "shaders/tiled_texture_fill_external.frag", "shaders/texture_fill_strict_src.frag", - "shaders/vertices.frag", "shaders/blending/porter_duff_blend.frag", "shaders/blending/porter_duff_blend.vert", "shaders/filters/border_mask_blur.frag", diff --git a/impeller/entity/contents/content_context.cc b/impeller/entity/contents/content_context.cc index fed3249729ada..7d0e6d9040742 100644 --- a/impeller/entity/contents/content_context.cc +++ b/impeller/entity/contents/content_context.cc @@ -439,7 +439,6 @@ ContentContext::ContentContext( GetContext()->GetCapabilities()->GetDefaultGlyphAtlasFormat() == PixelFormat::kA8UNormInt)}); glyph_atlas_color_pipelines_.CreateDefault(*context_, options); - geometry_color_pipelines_.CreateDefault(*context_, options); yuv_to_rgb_filter_pipelines_.CreateDefault(*context_, options_trianglestrip); porter_duff_blend_pipelines_.CreateDefault(*context_, options_trianglestrip, {supports_decal}); diff --git a/impeller/entity/contents/content_context.h b/impeller/entity/contents/content_context.h index 26f3fc5761524..a21e110c51178 100644 --- a/impeller/entity/contents/content_context.h +++ b/impeller/entity/contents/content_context.h @@ -46,7 +46,6 @@ #include "impeller/entity/morphology_filter.frag.h" #include "impeller/entity/porter_duff_blend.frag.h" #include "impeller/entity/porter_duff_blend.vert.h" -#include "impeller/entity/position_color.vert.h" #include "impeller/entity/radial_gradient_fill.frag.h" #include "impeller/entity/rrect_blur.frag.h" #include "impeller/entity/rrect_blur.vert.h" @@ -59,7 +58,6 @@ #include "impeller/entity/texture_fill_strict_src.frag.h" #include "impeller/entity/texture_uv_fill.vert.h" #include "impeller/entity/tiled_texture_fill.frag.h" -#include "impeller/entity/vertices.frag.h" #include "impeller/entity/yuv_to_rgb_filter.frag.h" #include "impeller/typographer/glyph_atlas.h" @@ -158,9 +156,6 @@ using PorterDuffBlendPipeline = PorterDuffBlendFragmentShader>; using ClipPipeline = RenderPipelineHandle; -using GeometryColorPipeline = - RenderPipelineHandle; - // Advanced blends using BlendColorPipeline = RenderPipelineHandle; @@ -526,11 +521,6 @@ class ContentContext { return GetPipeline(glyph_atlas_color_pipelines_, opts); } - std::shared_ptr> GetGeometryColorPipeline( - ContentContextOptions opts) const { - return GetPipeline(geometry_color_pipelines_, opts); - } - std::shared_ptr> GetYUVToRGBFilterPipeline( ContentContextOptions opts) const { return GetPipeline(yuv_to_rgb_filter_pipelines_, opts); @@ -928,7 +918,6 @@ class ContentContext { mutable Variants clip_pipelines_; mutable Variants glyph_atlas_pipelines_; mutable Variants glyph_atlas_color_pipelines_; - mutable Variants geometry_color_pipelines_; mutable Variants yuv_to_rgb_filter_pipelines_; mutable Variants porter_duff_blend_pipelines_; // Advanced blends. diff --git a/impeller/entity/shaders/position_color.vert b/impeller/entity/shaders/position_color.vert deleted file mode 100644 index d8a0b28fa916a..0000000000000 --- a/impeller/entity/shaders/position_color.vert +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include -#include - -uniform FrameInfo { - mat4 mvp; -} -frame_info; - -in vec2 position; -in vec4 color; - -out mediump f16vec4 v_color; - -void main() { - gl_Position = frame_info.mvp * vec4(position, 0.0, 1.0); - v_color = f16vec4(color); -} diff --git a/impeller/entity/shaders/vertices.frag b/impeller/entity/shaders/vertices.frag deleted file mode 100644 index e3eaab01cda80..0000000000000 --- a/impeller/entity/shaders/vertices.frag +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -precision mediump float; - -#include - -uniform FragInfo { - float16_t alpha; -} -frag_info; - -in f16vec4 v_color; - -out f16vec4 frag_color; - -void main() { - frag_color = v_color * frag_info.alpha; -} diff --git a/impeller/tools/malioc.json b/impeller/tools/malioc.json index 3b786ec1d4e3f..abff6dc3ba488 100644 --- a/impeller/tools/malioc.json +++ b/impeller/tools/malioc.json @@ -3729,163 +3729,6 @@ } } }, - "flutter/impeller/entity/gles/position_color.vert.gles": { - "Mali-G78": { - "core": "Mali-G78", - "filename": "flutter/impeller/entity/gles/position_color.vert.gles", - "has_uniform_computation": false, - "type": "Vertex", - "variants": { - "Position": { - "fp16_arithmetic": 0, - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "load_store" - ], - "longest_path_cycles": [ - 0.140625, - 0.140625, - 0.0, - 0.0, - 2.0, - 0.0 - ], - "pipelines": [ - "arith_total", - "arith_fma", - "arith_cvt", - "arith_sfu", - "load_store", - "texture" - ], - "shortest_path_bound_pipelines": [ - "load_store" - ], - "shortest_path_cycles": [ - 0.140625, - 0.140625, - 0.0, - 0.0, - 2.0, - 0.0 - ], - "total_bound_pipelines": [ - "load_store" - ], - "total_cycles": [ - 0.140625, - 0.140625, - 0.0, - 0.0, - 2.0, - 0.0 - ] - }, - "stack_spill_bytes": 0, - "thread_occupancy": 100, - "uniform_registers_used": 20, - "work_registers_used": 32 - }, - "Varying": { - "fp16_arithmetic": null, - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "load_store" - ], - "longest_path_cycles": [ - 0.0, - 0.0, - 0.0, - 0.0, - 3.0, - 0.0 - ], - "pipelines": [ - "arith_total", - "arith_fma", - "arith_cvt", - "arith_sfu", - "load_store", - "texture" - ], - "shortest_path_bound_pipelines": [ - "load_store" - ], - "shortest_path_cycles": [ - 0.0, - 0.0, - 0.0, - 0.0, - 3.0, - 0.0 - ], - "total_bound_pipelines": [ - "load_store" - ], - "total_cycles": [ - 0.0, - 0.0, - 0.0, - 0.0, - 3.0, - 0.0 - ] - }, - "stack_spill_bytes": 0, - "thread_occupancy": 100, - "uniform_registers_used": 8, - "work_registers_used": 7 - } - } - }, - "Mali-T880": { - "core": "Mali-T880", - "filename": "flutter/impeller/entity/gles/position_color.vert.gles", - "has_uniform_computation": false, - "type": "Vertex", - "variants": { - "Main": { - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "load_store" - ], - "longest_path_cycles": [ - 2.640000104904175, - 5.0, - 0.0 - ], - "pipelines": [ - "arithmetic", - "load_store", - "texture" - ], - "shortest_path_bound_pipelines": [ - "load_store" - ], - "shortest_path_cycles": [ - 2.640000104904175, - 5.0, - 0.0 - ], - "total_bound_pipelines": [ - "load_store" - ], - "total_cycles": [ - 2.6666667461395264, - 5.0, - 0.0 - ] - }, - "thread_occupancy": 100, - "uniform_registers_used": 5, - "work_registers_used": 2 - } - } - } - }, "flutter/impeller/entity/gles/radial_gradient_fill.frag.gles": { "Mali-G78": { "core": "Mali-G78", @@ -5747,123 +5590,6 @@ } } }, - "flutter/impeller/entity/gles/vertices.frag.gles": { - "Mali-G78": { - "core": "Mali-G78", - "filename": "flutter/impeller/entity/gles/vertices.frag.gles", - "has_side_effects": false, - "has_uniform_computation": false, - "modifies_coverage": false, - "reads_color_buffer": false, - "type": "Fragment", - "uses_late_zs_test": false, - "uses_late_zs_update": false, - "variants": { - "Main": { - "fp16_arithmetic": 100, - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "varying" - ], - "longest_path_cycles": [ - 0.03125, - 0.03125, - 0.03125, - 0.0, - 0.0, - 0.25, - 0.0 - ], - "pipelines": [ - "arith_total", - "arith_fma", - "arith_cvt", - "arith_sfu", - "load_store", - "varying", - "texture" - ], - "shortest_path_bound_pipelines": [ - "varying" - ], - "shortest_path_cycles": [ - 0.03125, - 0.03125, - 0.0, - 0.0, - 0.0, - 0.25, - 0.0 - ], - "total_bound_pipelines": [ - "varying" - ], - "total_cycles": [ - 0.03125, - 0.03125, - 0.03125, - 0.0, - 0.0, - 0.25, - 0.0 - ] - }, - "stack_spill_bytes": 0, - "thread_occupancy": 100, - "uniform_registers_used": 2, - "work_registers_used": 19 - } - } - }, - "Mali-T880": { - "core": "Mali-T880", - "filename": "flutter/impeller/entity/gles/vertices.frag.gles", - "has_uniform_computation": false, - "type": "Fragment", - "variants": { - "Main": { - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "arithmetic", - "load_store" - ], - "longest_path_cycles": [ - 1.0, - 1.0, - 0.0 - ], - "pipelines": [ - "arithmetic", - "load_store", - "texture" - ], - "shortest_path_bound_pipelines": [ - "arithmetic", - "load_store" - ], - "shortest_path_cycles": [ - 1.0, - 1.0, - 0.0 - ], - "total_bound_pipelines": [ - "load_store" - ], - "total_cycles": [ - 0.6666666865348816, - 1.0, - 0.0 - ] - }, - "thread_occupancy": 100, - "uniform_registers_used": 1, - "work_registers_used": 2 - } - } - } - }, "flutter/impeller/entity/gles/vertices_uber.frag.gles": { "Mali-G78": { "core": "Mali-G78", @@ -6932,118 +6658,6 @@ } } }, - "flutter/impeller/entity/position_color.vert.vkspv": { - "Mali-G78": { - "core": "Mali-G78", - "filename": "flutter/impeller/entity/position_color.vert.vkspv", - "has_uniform_computation": true, - "type": "Vertex", - "variants": { - "Position": { - "fp16_arithmetic": 0, - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "load_store" - ], - "longest_path_cycles": [ - 0.125, - 0.125, - 0.0, - 0.0, - 2.0, - 0.0 - ], - "pipelines": [ - "arith_total", - "arith_fma", - "arith_cvt", - "arith_sfu", - "load_store", - "texture" - ], - "shortest_path_bound_pipelines": [ - "load_store" - ], - "shortest_path_cycles": [ - 0.125, - 0.125, - 0.0, - 0.0, - 2.0, - 0.0 - ], - "total_bound_pipelines": [ - "load_store" - ], - "total_cycles": [ - 0.125, - 0.125, - 0.0, - 0.0, - 2.0, - 0.0 - ] - }, - "stack_spill_bytes": 0, - "thread_occupancy": 100, - "uniform_registers_used": 28, - "work_registers_used": 32 - }, - "Varying": { - "fp16_arithmetic": null, - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "load_store" - ], - "longest_path_cycles": [ - 0.0, - 0.0, - 0.0, - 0.0, - 3.0, - 0.0 - ], - "pipelines": [ - "arith_total", - "arith_fma", - "arith_cvt", - "arith_sfu", - "load_store", - "texture" - ], - "shortest_path_bound_pipelines": [ - "load_store" - ], - "shortest_path_cycles": [ - 0.0, - 0.0, - 0.0, - 0.0, - 3.0, - 0.0 - ], - "total_bound_pipelines": [ - "load_store" - ], - "total_cycles": [ - 0.0, - 0.0, - 0.0, - 0.0, - 3.0, - 0.0 - ] - }, - "stack_spill_bytes": 0, - "thread_occupancy": 100, - "uniform_registers_used": 20, - "work_registers_used": 7 - } - } - } - }, "flutter/impeller/entity/radial_gradient_fill.frag.vkspv": { "Mali-G78": { "core": "Mali-G78", @@ -8398,76 +8012,6 @@ } } }, - "flutter/impeller/entity/vertices.frag.vkspv": { - "Mali-G78": { - "core": "Mali-G78", - "filename": "flutter/impeller/entity/vertices.frag.vkspv", - "has_side_effects": false, - "has_uniform_computation": true, - "modifies_coverage": false, - "reads_color_buffer": false, - "type": "Fragment", - "uses_late_zs_test": false, - "uses_late_zs_update": false, - "variants": { - "Main": { - "fp16_arithmetic": 100, - "has_stack_spilling": false, - "performance": { - "longest_path_bound_pipelines": [ - "varying" - ], - "longest_path_cycles": [ - 0.03125, - 0.03125, - 0.0, - 0.0, - 0.0, - 0.25, - 0.0 - ], - "pipelines": [ - "arith_total", - "arith_fma", - "arith_cvt", - "arith_sfu", - "load_store", - "varying", - "texture" - ], - "shortest_path_bound_pipelines": [ - "varying" - ], - "shortest_path_cycles": [ - 0.03125, - 0.03125, - 0.0, - 0.0, - 0.0, - 0.25, - 0.0 - ], - "total_bound_pipelines": [ - "varying" - ], - "total_cycles": [ - 0.03125, - 0.03125, - 0.0, - 0.0, - 0.0, - 0.25, - 0.0 - ] - }, - "stack_spill_bytes": 0, - "thread_occupancy": 100, - "uniform_registers_used": 2, - "work_registers_used": 4 - } - } - } - }, "flutter/impeller/entity/vertices_uber.frag.vkspv": { "Mali-G78": { "core": "Mali-G78",