Skip to content

Commit 8ec35b6

Browse files
authored
[Impeller] removed old blur detritus (flutter#51779)
[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 666eeb6 commit 8ec35b6

9 files changed

Lines changed: 322 additions & 828 deletions

File tree

ci/licenses_golden/licenses_flutter

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40037,11 +40037,8 @@ ORIGIN: ../../../flutter/impeller/entity/shaders/conical_gradient_fill.frag + ..
4003740037
ORIGIN: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag + ../../../flutter/LICENSE
4003840038
ORIGIN: ../../../flutter/impeller/entity/shaders/debug/checkerboard.frag + ../../../flutter/LICENSE
4003940039
ORIGIN: ../../../flutter/impeller/entity/shaders/debug/checkerboard.vert + ../../../flutter/LICENSE
40040-
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl + ../../../flutter/LICENSE
40041-
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert + ../../../flutter/LICENSE
40042-
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag + ../../../flutter/LICENSE
40043-
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag + ../../../flutter/LICENSE
4004440040
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.glsl + ../../../flutter/LICENSE
40041+
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.vert + ../../../flutter/LICENSE
4004540042
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_decal.frag + ../../../flutter/LICENSE
4004640043
ORIGIN: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag + ../../../flutter/LICENSE
4004740044
ORIGIN: ../../../flutter/impeller/entity/shaders/geometry/points.comp + ../../../flutter/LICENSE
@@ -42916,11 +42913,8 @@ FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_fill.frag
4291642913
FILE: ../../../flutter/impeller/entity/shaders/conical_gradient_ssbo_fill.frag
4291742914
FILE: ../../../flutter/impeller/entity/shaders/debug/checkerboard.frag
4291842915
FILE: ../../../flutter/impeller/entity/shaders/debug/checkerboard.vert
42919-
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl
42920-
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur.vert
42921-
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag
42922-
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag
4292342916
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.glsl
42917+
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel.vert
4292442918
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_decal.frag
4292542919
FILE: ../../../flutter/impeller/entity/shaders/gaussian_blur/kernel_nodecal.frag
4292642920
FILE: ../../../flutter/impeller/entity/shaders/geometry/points.comp

impeller/entity/BUILD.gn

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ impeller_shaders("entity_shaders") {
2525
"shaders/color_matrix_color_filter.frag",
2626
"shaders/color_matrix_color_filter.vert",
2727
"shaders/conical_gradient_fill.frag",
28-
"shaders/gaussian_blur/gaussian_blur.vert",
29-
"shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag",
30-
"shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag",
3128
"shaders/gaussian_blur/kernel_decal.frag",
3229
"shaders/gaussian_blur/kernel_nodecal.frag",
30+
"shaders/gaussian_blur/kernel.vert",
3331
"shaders/glyph_atlas.frag",
3432
"shaders/glyph_atlas_color.frag",
3533
"shaders/glyph_atlas.vert",

impeller/entity/contents/content_context.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,10 +405,6 @@ ContentContext::ContentContext(
405405
texture_strict_src_pipelines_.CreateDefault(*context_, options);
406406
position_uv_pipelines_.CreateDefault(*context_, options);
407407
tiled_texture_pipelines_.CreateDefault(*context_, options);
408-
gaussian_blur_noalpha_decal_pipelines_.CreateDefault(*context_,
409-
options_trianglestrip);
410-
gaussian_blur_noalpha_nodecal_pipelines_.CreateDefault(*context_,
411-
options_trianglestrip);
412408
kernel_decal_pipelines_.CreateDefault(*context_, options_trianglestrip);
413409
kernel_nodecal_pipelines_.CreateDefault(*context_, options_trianglestrip);
414410
border_mask_blur_pipelines_.CreateDefault(*context_, options_trianglestrip);

impeller/entity/contents/content_context.h

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@
6767
#include "impeller/entity/yuv_to_rgb_filter.frag.h"
6868
#include "impeller/entity/yuv_to_rgb_filter.vert.h"
6969

70-
#include "impeller/entity/gaussian_blur.vert.h"
71-
#include "impeller/entity/gaussian_blur_noalpha_decal.frag.h"
72-
#include "impeller/entity/gaussian_blur_noalpha_nodecal.frag.h"
70+
#include "impeller/entity/kernel.vert.h"
7371
#include "impeller/entity/kernel_decal.frag.h"
7472
#include "impeller/entity/kernel_nodecal.frag.h"
7573

@@ -139,16 +137,10 @@ using PositionUVPipeline =
139137
RenderPipelineT<TextureFillVertexShader, TiledTextureFillFragmentShader>;
140138
using TiledTexturePipeline =
141139
RenderPipelineT<TextureFillVertexShader, TiledTextureFillFragmentShader>;
142-
using GaussianBlurDecalPipeline =
143-
RenderPipelineT<GaussianBlurVertexShader,
144-
GaussianBlurNoalphaDecalFragmentShader>;
145-
using GaussianBlurPipeline =
146-
RenderPipelineT<GaussianBlurVertexShader,
147-
GaussianBlurNoalphaNodecalFragmentShader>;
148140
using KernelDecalPipeline =
149-
RenderPipelineT<GaussianBlurVertexShader, KernelDecalFragmentShader>;
141+
RenderPipelineT<KernelVertexShader, KernelDecalFragmentShader>;
150142
using KernelPipeline =
151-
RenderPipelineT<GaussianBlurVertexShader, KernelNodecalFragmentShader>;
143+
RenderPipelineT<KernelVertexShader, KernelNodecalFragmentShader>;
152144
using BorderMaskBlurPipeline =
153145
RenderPipelineT<BorderMaskBlurVertexShader, BorderMaskBlurFragmentShader>;
154146
using MorphologyFilterPipeline =
@@ -523,16 +515,6 @@ class ContentContext {
523515
return GetPipeline(tiled_texture_pipelines_, opts);
524516
}
525517

526-
std::shared_ptr<Pipeline<PipelineDescriptor>> GetGaussianBlurDecalPipeline(
527-
ContentContextOptions opts) const {
528-
return GetPipeline(gaussian_blur_noalpha_decal_pipelines_, opts);
529-
}
530-
531-
std::shared_ptr<Pipeline<PipelineDescriptor>> GetGaussianBlurPipeline(
532-
ContentContextOptions opts) const {
533-
return GetPipeline(gaussian_blur_noalpha_nodecal_pipelines_, opts);
534-
}
535-
536518
std::shared_ptr<Pipeline<PipelineDescriptor>> GetKernelDecalPipeline(
537519
ContentContextOptions opts) const {
538520
return GetPipeline(kernel_decal_pipelines_, opts);
@@ -977,10 +959,6 @@ class ContentContext {
977959
#endif // IMPELLER_ENABLE_OPENGLES
978960
mutable Variants<PositionUVPipeline> position_uv_pipelines_;
979961
mutable Variants<TiledTexturePipeline> tiled_texture_pipelines_;
980-
mutable Variants<GaussianBlurDecalPipeline>
981-
gaussian_blur_noalpha_decal_pipelines_;
982-
mutable Variants<GaussianBlurPipeline>
983-
gaussian_blur_noalpha_nodecal_pipelines_;
984962
mutable Variants<KernelDecalPipeline> kernel_decal_pipelines_;
985963
mutable Variants<KernelPipeline> kernel_nodecal_pipelines_;
986964
mutable Variants<BorderMaskBlurPipeline> border_mask_blur_pipelines_;

impeller/entity/shaders/gaussian_blur/gaussian_blur.glsl

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

impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_decal.frag

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

impeller/entity/shaders/gaussian_blur/gaussian_blur_noalpha_nodecal.frag

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.

0 commit comments

Comments
 (0)