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

Commit 6844143

Browse files
zandersozanderso
authored
Reverts specialization constant PR and one change that used it (#47650)
Reverts 79461cd and f899cc7
1 parent 72262a2 commit 6844143

File tree

67 files changed

+4558
-1608
lines changed

Some content is hidden

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

67 files changed

+4558
-1608
lines changed

‎ci/licenses_golden/licenses_flutter

Lines changed: 72 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3134,13 +3134,42 @@ ORIGIN: ../../../flutter/impeller/entity/inline_pass_context.cc + ../../../flutt
31343134
ORIGIN: ../../../flutter/impeller/entity/inline_pass_context.h + ../../../flutter/LICENSE
31353135
ORIGIN: ../../../flutter/impeller/entity/render_target_cache.cc + ../../../flutter/LICENSE
31363136
ORIGIN: ../../../flutter/impeller/entity/render_target_cache.h + ../../../flutter/LICENSE
3137-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.frag + ../../../flutter/LICENSE
3137+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.glsl + ../../../flutter/LICENSE
31383138
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.vert + ../../../flutter/LICENSE
3139+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_color.frag + ../../../flutter/LICENSE
3140+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colorburn.frag + ../../../flutter/LICENSE
3141+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colordodge.frag + ../../../flutter/LICENSE
3142+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_darken.frag + ../../../flutter/LICENSE
3143+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_difference.frag + ../../../flutter/LICENSE
3144+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_exclusion.frag + ../../../flutter/LICENSE
3145+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hardlight.frag + ../../../flutter/LICENSE
3146+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hue.frag + ../../../flutter/LICENSE
3147+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_lighten.frag + ../../../flutter/LICENSE
3148+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_luminosity.frag + ../../../flutter/LICENSE
3149+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_multiply.frag + ../../../flutter/LICENSE
3150+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_overlay.frag + ../../../flutter/LICENSE
3151+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_saturation.frag + ../../../flutter/LICENSE
3152+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_screen.frag + ../../../flutter/LICENSE
3153+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_softlight.frag + ../../../flutter/LICENSE
31393154
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend.frag + ../../../flutter/LICENSE
31403155
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend.vert + ../../../flutter/LICENSE
3141-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/blend_select.glsl + ../../../flutter/LICENSE
3142-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.frag + ../../../flutter/LICENSE
3143-
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.vert + ../../../flutter/LICENSE
3156+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.glsl + ../../../flutter/LICENSE
3157+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.vert + ../../../flutter/LICENSE
3158+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_color.frag + ../../../flutter/LICENSE
3159+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colorburn.frag + ../../../flutter/LICENSE
3160+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colordodge.frag + ../../../flutter/LICENSE
3161+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_darken.frag + ../../../flutter/LICENSE
3162+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_difference.frag + ../../../flutter/LICENSE
3163+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_exclusion.frag + ../../../flutter/LICENSE
3164+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hardlight.frag + ../../../flutter/LICENSE
3165+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hue.frag + ../../../flutter/LICENSE
3166+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_lighten.frag + ../../../flutter/LICENSE
3167+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_luminosity.frag + ../../../flutter/LICENSE
3168+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_multiply.frag + ../../../flutter/LICENSE
3169+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_overlay.frag + ../../../flutter/LICENSE
3170+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_saturation.frag + ../../../flutter/LICENSE
3171+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_screen.frag + ../../../flutter/LICENSE
3172+
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_softlight.frag + ../../../flutter/LICENSE
31443173
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.frag + ../../../flutter/LICENSE
31453174
ORIGIN: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.vert + ../../../flutter/LICENSE
31463175
ORIGIN: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag + ../../../flutter/LICENSE
@@ -3153,8 +3182,10 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/conical_gradient_fill.frag + ..
31533182
ORIGIN: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag + ../../../flutter/LICENSE
31543183
ORIGIN: ../../../flutter/impeller/entity/shaders/debug/checkerboard.frag + ../../../flutter/LICENSE
31553184
ORIGIN: ../../../flutter/impeller/entity/shaders/debug/checkerboard.vert + ../../../flutter/LICENSE
3156-
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.frag + ../../../flutter/LICENSE
3185+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl + ../../../flutter/LICENSE
31573186
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert + ../../../flutter/LICENSE
3187+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag + ../../../flutter/LICENSE
3188+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag + ../../../flutter/LICENSE
31583189
ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/points.comp + ../../../flutter/LICENSE
31593190
ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/uv.comp + ../../../flutter/LICENSE
31603191
ORIGIN: ../../../flutter/impeller/entity/shaders/glyph_atlas.frag + ../../../flutter/LICENSE
@@ -5886,13 +5917,42 @@ FILE: ../../../flutter/impeller/entity/inline_pass_context.cc
58865917
FILE: ../../../flutter/impeller/entity/inline_pass_context.h
58875918
FILE: ../../../flutter/impeller/entity/render_target_cache.cc
58885919
FILE: ../../../flutter/impeller/entity/render_target_cache.h
5889-
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.frag
5920+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.glsl
58905921
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend.vert
5922+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_color.frag
5923+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colorburn.frag
5924+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_colordodge.frag
5925+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_darken.frag
5926+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_difference.frag
5927+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_exclusion.frag
5928+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hardlight.frag
5929+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_hue.frag
5930+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_lighten.frag
5931+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_luminosity.frag
5932+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_multiply.frag
5933+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_overlay.frag
5934+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_saturation.frag
5935+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_screen.frag
5936+
FILE: ../../../flutter/impeller/entity/shaders/blending/advanced_blend_softlight.frag
58915937
FILE: ../../../flutter/impeller/entity/shaders/blending/blend.frag
58925938
FILE: ../../../flutter/impeller/entity/shaders/blending/blend.vert
5893-
FILE: ../../../flutter/impeller/entity/shaders/blending/blend_select.glsl
5894-
FILE: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.frag
5895-
FILE: ../../../flutter/impeller/entity/shaders/blending/framebuffer_blend.vert
5939+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.glsl
5940+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend.vert
5941+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_color.frag
5942+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colorburn.frag
5943+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_colordodge.frag
5944+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_darken.frag
5945+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_difference.frag
5946+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_exclusion.frag
5947+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hardlight.frag
5948+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_hue.frag
5949+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_lighten.frag
5950+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_luminosity.frag
5951+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_multiply.frag
5952+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_overlay.frag
5953+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_saturation.frag
5954+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_screen.frag
5955+
FILE: ../../../flutter/impeller/entity/shaders/blending/ios/framebuffer_blend_softlight.frag
58965956
FILE: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.frag
58975957
FILE: ../../../flutter/impeller/entity/shaders/blending/porter_duff_blend.vert
58985958
FILE: ../../../flutter/impeller/entity/shaders/border_mask_blur.frag
@@ -5905,8 +5965,10 @@ FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_fill.frag
59055965
FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
59065966
FILE: ../../../flutter/impeller/entity/shaders/debug/checkerboard.frag
59075967
FILE: ../../../flutter/impeller/entity/shaders/debug/checkerboard.vert
5908-
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.frag
5968+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
59095969
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
5970+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
5971+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag
59105972
FILE: ../../../flutter/impeller/entity/shaders/geometry/points.comp
59115973
FILE: ../../../flutter/impeller/entity/shaders/geometry/uv.comp
59125974
FILE: ../../../flutter/impeller/entity/shaders/glyph_atlas.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 & 93 deletions
This file was deleted.

‎impeller/entity/BUILD.gn

Lines changed: 33 additions & 4 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",
@@ -26,7 +40,8 @@ impeller_shaders("entity_shaders") {
2640
"shaders/color_matrix_color_filter.vert",
2741
"shaders/conical_gradient_fill.frag",
2842
"shaders/gaussian_blur/gaussian_blur.vert",
29-
"shaders/gaussian_blur/gaussian_blur.frag",
43+
"shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag",
44+
"shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag",
3045
"shaders/glyph_atlas.frag",
3146
"shaders/glyph_atlas_color.frag",
3247
"shaders/glyph_atlas.vert",
@@ -100,8 +115,22 @@ impeller_shaders("framebuffer_blend_entity_shaders") {
100115
}
101116

102117
shaders = [
103-
"shaders/blending/framebuffer_blend.vert",
104-
"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",
105134
]
106135
}
107136

‎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)