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

Commit 0627c1c

Browse files
author
auto-submit[bot]
committed
Revert "[Impeller] Add support for specialization constants redux. (#47678)"
This reverts commit be43db3.
1 parent 04dba37 commit 0627c1c

File tree

64 files changed

+3982
-1246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3982
-1246
lines changed

‎ci/licenses_golden/licenses_flutter

Lines changed: 66 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3136,13 +3136,42 @@ ORIGIN: ../../../flutter/impeller/entity/inline_pass_context.cc + ../../../flutt
31363136
ORIGIN: ../../../flutter/impeller/entity/inline_pass_context.h + ../../../flutter/LICENSE
31373137
ORIGIN: ../../../flutter/impeller/entity/render_target_cache.cc + ../../../flutter/LICENSE
31383138
ORIGIN: ../../../flutter/impeller/entity/render_target_cache.h + ../../../flutter/LICENSE
3139-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.frag + ../../../flutter/LICENSE
3139+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.glsl + ../../../flutter/LICENSE
31403140
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.vert + ../../../flutter/LICENSE
3141+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_color.frag + ../../../flutter/LICENSE
3142+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colorburn.frag + ../../../flutter/LICENSE
3143+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colordodge.frag + ../../../flutter/LICENSE
3144+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_darken.frag + ../../../flutter/LICENSE
3145+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_difference.frag + ../../../flutter/LICENSE
3146+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_exclusion.frag + ../../../flutter/LICENSE
3147+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hardlight.frag + ../../../flutter/LICENSE
3148+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hue.frag + ../../../flutter/LICENSE
3149+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_lighten.frag + ../../../flutter/LICENSE
3150+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_luminosity.frag + ../../../flutter/LICENSE
3151+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_multiply.frag + ../../../flutter/LICENSE
3152+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_overlay.frag + ../../../flutter/LICENSE
3153+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_saturation.frag + ../../../flutter/LICENSE
3154+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_screen.frag + ../../../flutter/LICENSE
3155+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_softlight.frag + ../../../flutter/LICENSE
31413156
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend.frag + ../../../flutter/LICENSE
31423157
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend.vert + ../../../flutter/LICENSE
3143-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend_select.glsl + ../../../flutter/LICENSE
3144-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.frag + ../../../flutter/LICENSE
3145-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.vert + ../../../flutter/LICENSE
3158+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.glsl + ../../../flutter/LICENSE
3159+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.vert + ../../../flutter/LICENSE
3160+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_color.frag + ../../../flutter/LICENSE
3161+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colorburn.frag + ../../../flutter/LICENSE
3162+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colordodge.frag + ../../../flutter/LICENSE
3163+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_darken.frag + ../../../flutter/LICENSE
3164+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_difference.frag + ../../../flutter/LICENSE
3165+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_exclusion.frag + ../../../flutter/LICENSE
3166+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hardlight.frag + ../../../flutter/LICENSE
3167+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hue.frag + ../../../flutter/LICENSE
3168+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_lighten.frag + ../../../flutter/LICENSE
3169+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_luminosity.frag + ../../../flutter/LICENSE
3170+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_multiply.frag + ../../../flutter/LICENSE
3171+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_overlay.frag + ../../../flutter/LICENSE
3172+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_saturation.frag + ../../../flutter/LICENSE
3173+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_screen.frag + ../../../flutter/LICENSE
3174+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_softlight.frag + ../../../flutter/LICENSE
31463175
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.frag + ../../../flutter/LICENSE
31473176
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.vert + ../../../flutter/LICENSE
31483177
ORIGIN: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag + ../../../flutter/LICENSE
@@ -5892,13 +5921,42 @@ FILE: ../../../flutter/impeller/entity/inline_pass_context.cc
58925921
FILE: ../../../flutter/impeller/entity/inline_pass_context.h
58935922
FILE: ../../../flutter/impeller/entity/render_target_cache.cc
58945923
FILE: ../../../flutter/impeller/entity/render_target_cache.h
5895-
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.frag
5924+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.glsl
58965925
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.vert
5926+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_color.frag
5927+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colorburn.frag
5928+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colordodge.frag
5929+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_darken.frag
5930+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_difference.frag
5931+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_exclusion.frag
5932+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hardlight.frag
5933+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hue.frag
5934+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_lighten.frag
5935+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_luminosity.frag
5936+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_multiply.frag
5937+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_overlay.frag
5938+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_saturation.frag
5939+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_screen.frag
5940+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_softlight.frag
58975941
FILE: ../../../flutter/impeller/entity/shaders/blending/blend.frag
58985942
FILE: ../../../flutter/impeller/entity/shaders/blending/blend.vert
5899-
FILE: ../../../flutter/impeller/entity/shaders/blending/blend_select.glsl
5900-
FILE: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.frag
5901-
FILE: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.vert
5943+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.glsl
5944+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.vert
5945+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_color.frag
5946+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colorburn.frag
5947+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colordodge.frag
5948+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_darken.frag
5949+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_difference.frag
5950+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_exclusion.frag
5951+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hardlight.frag
5952+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hue.frag
5953+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_lighten.frag
5954+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_luminosity.frag
5955+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_multiply.frag
5956+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_overlay.frag
5957+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_saturation.frag
5958+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_screen.frag
5959+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_softlight.frag
59025960
FILE: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.frag
59035961
FILE: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.vert
59045962
FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag

‎impeller/base/comparable.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@
88
#include <functional>
99
#include <map>
1010
#include <memory>
11+
#include <string>
1112
#include <type_traits>
1213

14+
#include "flutter/fml/hash_combine.h"
15+
#include "flutter/fml/macros.h"
16+
1317
namespace impeller {
1418

1519
struct UniqueID {

‎impeller/docs/specialization_constants.md

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

‎impeller/entity/BUILD.gn

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,21 @@ impeller_shaders("entity_shaders") {
1515

1616
shaders = [
1717
"shaders/blending/advanced_blend.vert",
18-
"shaders/blending/advanced_blend.frag",
18+
"shaders/blending/advanced_blend_color.frag",
19+
"shaders/blending/advanced_blend_colorburn.frag",
20+
"shaders/blending/advanced_blend_colordodge.frag",
21+
"shaders/blending/advanced_blend_darken.frag",
22+
"shaders/blending/advanced_blend_difference.frag",
23+
"shaders/blending/advanced_blend_exclusion.frag",
24+
"shaders/blending/advanced_blend_hardlight.frag",
25+
"shaders/blending/advanced_blend_hue.frag",
26+
"shaders/blending/advanced_blend_lighten.frag",
27+
"shaders/blending/advanced_blend_luminosity.frag",
28+
"shaders/blending/advanced_blend_multiply.frag",
29+
"shaders/blending/advanced_blend_overlay.frag",
30+
"shaders/blending/advanced_blend_saturation.frag",
31+
"shaders/blending/advanced_blend_screen.frag",
32+
"shaders/blending/advanced_blend_softlight.frag",
1933
"shaders/blending/blend.frag",
2034
"shaders/blending/blend.vert",
2135
"shaders/border_mask_blur.frag",
@@ -101,8 +115,22 @@ impeller_shaders("framebuffer_blend_entity_shaders") {
101115
}
102116

103117
shaders = [
104-
"shaders/blending/framebuffer_blend.vert",
105-
"shaders/blending/framebuffer_blend.frag",
118+
"shaders/blending/ios/framebuffer_blend.vert",
119+
"shaders/blending/ios/framebuffer_blend_color.frag",
120+
"shaders/blending/ios/framebuffer_blend_colorburn.frag",
121+
"shaders/blending/ios/framebuffer_blend_colordodge.frag",
122+
"shaders/blending/ios/framebuffer_blend_darken.frag",
123+
"shaders/blending/ios/framebuffer_blend_difference.frag",
124+
"shaders/blending/ios/framebuffer_blend_exclusion.frag",
125+
"shaders/blending/ios/framebuffer_blend_hardlight.frag",
126+
"shaders/blending/ios/framebuffer_blend_hue.frag",
127+
"shaders/blending/ios/framebuffer_blend_lighten.frag",
128+
"shaders/blending/ios/framebuffer_blend_luminosity.frag",
129+
"shaders/blending/ios/framebuffer_blend_multiply.frag",
130+
"shaders/blending/ios/framebuffer_blend_overlay.frag",
131+
"shaders/blending/ios/framebuffer_blend_saturation.frag",
132+
"shaders/blending/ios/framebuffer_blend_screen.frag",
133+
"shaders/blending/ios/framebuffer_blend_softlight.frag",
106134
]
107135
}
108136

‎impeller/entity/contents/atlas_contents.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ bool AtlasContents::Render(const ContentContext& renderer,
262262
dst_sampler_descriptor.width_address_mode = SamplerAddressMode::kDecal;
263263
dst_sampler_descriptor.height_address_mode = SamplerAddressMode::kDecal;
264264
}
265+
frag_info.supports_decal_sampler_address_mode =
266+
renderer.GetDeviceCapabilities().SupportsDecalSamplerAddressMode();
265267
auto dst_sampler = renderer.GetContext()->GetSamplerLibrary()->GetSampler(
266268
dst_sampler_descriptor);
267269
FS::BindTextureSamplerDst(cmd, texture_, dst_sampler);

0 commit comments

Comments
 (0)