Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit db2c987

Browse files
author
auto-submit[bot]
committed
Revert "[Impeller] Implement draw order optimization. (#54067)"
This reverts commit 1df62d3.
1 parent 09a2c56 commit db2c987

11 files changed

+35
-495
lines changed

ci/licenses_golden/excluded_files

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
../../../flutter/impeller/entity/contents/host_buffer_unittests.cc
165165
../../../flutter/impeller/entity/contents/test
166166
../../../flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc
167-
../../../flutter/impeller/entity/draw_order_resolver_unittests.cc
168167
../../../flutter/impeller/entity/entity_pass_target_unittests.cc
169168
../../../flutter/impeller/entity/entity_pass_unittests.cc
170169
../../../flutter/impeller/entity/entity_unittests.cc

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42130,8 +42130,6 @@ ORIGIN: ../../../flutter/impeller/entity/contents/tiled_texture_contents.cc + ..
4213042130
ORIGIN: ../../../flutter/impeller/entity/contents/tiled_texture_contents.h + ../../../flutter/LICENSE
4213142131
ORIGIN: ../../../flutter/impeller/entity/contents/vertices_contents.cc + ../../../flutter/LICENSE
4213242132
ORIGIN: ../../../flutter/impeller/entity/contents/vertices_contents.h + ../../../flutter/LICENSE
42133-
ORIGIN: ../../../flutter/impeller/entity/draw_order_resolver.cc + ../../../flutter/LICENSE
42134-
ORIGIN: ../../../flutter/impeller/entity/draw_order_resolver.h + ../../../flutter/LICENSE
4213542133
ORIGIN: ../../../flutter/impeller/entity/entity.cc + ../../../flutter/LICENSE
4213642134
ORIGIN: ../../../flutter/impeller/entity/entity.h + ../../../flutter/LICENSE
4213742135
ORIGIN: ../../../flutter/impeller/entity/entity_pass.cc + ../../../flutter/LICENSE
@@ -45017,8 +45015,6 @@ FILE: ../../../flutter/impeller/entity/contents/tiled_texture_contents.cc
4501745015
FILE: ../../../flutter/impeller/entity/contents/tiled_texture_contents.h
4501845016
FILE: ../../../flutter/impeller/entity/contents/vertices_contents.cc
4501945017
FILE: ../../../flutter/impeller/entity/contents/vertices_contents.h
45020-
FILE: ../../../flutter/impeller/entity/draw_order_resolver.cc
45021-
FILE: ../../../flutter/impeller/entity/draw_order_resolver.h
4502245018
FILE: ../../../flutter/impeller/entity/entity.cc
4502345019
FILE: ../../../flutter/impeller/entity/entity.h
4502445020
FILE: ../../../flutter/impeller/entity/entity_pass.cc

impeller/entity/BUILD.gn

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ impeller_component("entity") {
166166
"contents/tiled_texture_contents.h",
167167
"contents/vertices_contents.cc",
168168
"contents/vertices_contents.h",
169-
"draw_order_resolver.cc",
170-
"draw_order_resolver.h",
171169
"entity.cc",
172170
"entity.h",
173171
"entity_pass.cc",
@@ -250,7 +248,6 @@ impeller_component("entity_unittests") {
250248
"contents/filters/matrix_filter_contents_unittests.cc",
251249
"contents/host_buffer_unittests.cc",
252250
"contents/tiled_texture_contents_unittests.cc",
253-
"draw_order_resolver_unittests.cc",
254251
"entity_pass_target_unittests.cc",
255252
"entity_pass_unittests.cc",
256253
"entity_playground.cc",

impeller/entity/contents/color_source_contents.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,6 @@ class ColorSourceContents : public Contents {
213213
pass.SetVertexBuffer(std::move(geometry_result.vertex_buffer));
214214
options.primitive_type = geometry_result.type;
215215

216-
// Enable depth writing for all opaque entities in order to allow
217-
// reordering. Opaque entities are coerced to source blending by
218-
// `EntityPass::AddEntity`.
219-
options.depth_write_enabled = options.blend_mode == BlendMode::kSource;
220-
221216
// Take the pre-populated vertex shader uniform struct and set managed
222217
// values.
223218
frame_info.mvp = geometry_result.transform;

impeller/entity/contents/filters/gaussian_blur_filter_contents.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -555,16 +555,16 @@ Entity ApplyBlurStyle(FilterContents::BlurStyle blur_style,
555555
const ContentContext& renderer, const Entity& entity,
556556
RenderPass& pass) mutable {
557557
bool result = true;
558+
blur_entity.SetClipDepth(entity.GetClipDepth());
559+
blur_entity.SetTransform(entity.GetTransform() *
560+
blurred_transform);
561+
result = result && blur_entity.Render(renderer, pass);
558562
snapshot_entity.SetTransform(
559563
entity.GetTransform() *
560564
Matrix::MakeScale(1.f / source_space_scalar) *
561565
snapshot_transform);
562566
snapshot_entity.SetClipDepth(entity.GetClipDepth());
563567
result = result && snapshot_entity.Render(renderer, pass);
564-
blur_entity.SetClipDepth(entity.GetClipDepth());
565-
blur_entity.SetTransform(entity.GetTransform() *
566-
blurred_transform);
567-
result = result && blur_entity.Render(renderer, pass);
568568
return result;
569569
}),
570570
fml::MakeCopyable([blur_entity = blur_entity.Clone(),

impeller/entity/contents/texture_contents.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ bool TextureContents::Render(const ContentContext& renderer,
153153
}
154154
pipeline_options.primitive_type = PrimitiveType::kTriangleStrip;
155155

156-
pipeline_options.depth_write_enabled =
157-
stencil_enabled_ && pipeline_options.blend_mode == BlendMode::kSource;
158-
159156
pass.SetPipeline(strict_source_rect_enabled_
160157
? renderer.GetTextureStrictSrcPipeline(pipeline_options)
161158
: renderer.GetTexturePipeline(pipeline_options));

impeller/entity/draw_order_resolver.cc

Lines changed: 0 additions & 124 deletions
This file was deleted.

impeller/entity/draw_order_resolver.h

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)