DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Impeller] remove SamplerLibrary forward declare. (flutter/engine#49573)

Browse Source 
The forward declaration of SamplerLibrary in context.h is uncessary. remove it and clean up includes.
This commit is contained in:
Jonah Williams 2024-01-06 11:20:39 -08:00 committed by GitHub
parent 0e9eb11238
commit 2c700c6a90
37 changed files with 4 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/flutter/impeller/entity/contents/atlas_contents.cc
View File

@ -6,23 +6,17 @@
#include <unordered_map>
#include <utility>
#include "flutter/fml/macros.h"
#include "impeller/core/formats.h"
#include "impeller/entity/contents/atlas_contents.h"
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/filters/blend_filter_contents.h"
#include "impeller/entity/contents/filters/color_filter_contents.h"
#include "impeller/entity/contents/filters/filter_contents.h"
#include "impeller/entity/contents/framebuffer_blend_contents.h"
#include "impeller/entity/contents/texture_contents.h"
#include "impeller/entity/entity.h"
#include "impeller/entity/geometry/geometry.h"
#include "impeller/entity/texture_fill.frag.h"
#include "impeller/entity/texture_fill.vert.h"
#include "impeller/geometry/color.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/conical_gradient_contents.cc
View File

@ -4,7 +4,6 @@
#include "conical_gradient_contents.h"
#include "flutter/fml/logging.h"
#include "impeller/entity/contents/clip_contents.h"
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/gradient_generator.h"
@ -12,7 +11,6 @@
#include "impeller/entity/geometry/geometry.h"
#include "impeller/geometry/gradient.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/filters/blend_filter_contents.cc
View File

@ -18,9 +18,7 @@
#include "impeller/entity/contents/solid_color_contents.h"
#include "impeller/entity/entity.h"
#include "impeller/geometry/color.h"
#include "impeller/geometry/path_builder.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/snapshot.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/filters/border_mask_blur_filter_contents.cc
View File

@ -8,7 +8,6 @@
#include "impeller/entity/contents/anonymous_contents.h"
#include "impeller/entity/contents/contents.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/filters/color_matrix_filter_contents.cc
View File

@ -13,7 +13,6 @@
#include "impeller/geometry/point.h"
#include "impeller/geometry/vector.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

3
engine/src/flutter/impeller/entity/contents/filters/directional_gaussian_blur_filter_contents.cc
View File

@ -6,10 +6,8 @@
#include <cmath>
#include <utility>
#include <valarray>
#include "impeller/base/strings.h"
#include "impeller/base/validation.h"
#include "impeller/core/formats.h"
#include "impeller/core/sampler_descriptor.h"
#include "impeller/entity/contents/content_context.h"
@ -19,7 +17,6 @@
#include "impeller/renderer/command_buffer.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/render_target.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc
View File

@ -11,7 +11,6 @@
#include "impeller/entity/texture_fill.vert.h"
#include "impeller/renderer/command.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/filters/linear_to_srgb_filter_contents.cc
View File

@ -8,9 +8,7 @@
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/contents.h"
#include "impeller/geometry/point.h"
#include "impeller/geometry/vector.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/filters/morphology_filter_contents.cc
View File

@ -10,7 +10,6 @@
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/contents.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/filters/srgb_to_linear_filter_contents.cc
View File

@ -8,9 +8,7 @@
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/contents.h"
#include "impeller/geometry/point.h"
#include "impeller/geometry/vector.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/filters/yuv_to_rgb_filter_contents.cc
View File

@ -9,7 +9,6 @@
#include "impeller/entity/contents/content_context.h"
#include "impeller/geometry/matrix.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/framebuffer_blend_contents.cc
View File

@ -6,7 +6,6 @@
#include "impeller/entity/contents/content_context.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/linear_gradient_contents.cc
View File

@ -4,14 +4,12 @@
#include "linear_gradient_contents.h"
#include "flutter/fml/logging.h"
#include "impeller/core/formats.h"
#include "impeller/entity/contents/clip_contents.h"
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/gradient_generator.h"
#include "impeller/entity/entity.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/radial_gradient_contents.cc
View File

@ -4,7 +4,6 @@
#include "radial_gradient_contents.h"
#include "flutter/fml/logging.h"
#include "impeller/entity/contents/clip_contents.h"
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/contents/gradient_generator.h"
@ -12,7 +11,6 @@
#include "impeller/entity/geometry/geometry.h"
#include "impeller/geometry/gradient.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/runtime_effect_contents.cc
View File

@ -18,7 +18,6 @@
#include "impeller/entity/runtime_effect.vert.h"
#include "impeller/renderer/pipeline_library.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/shader_function.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/sweep_gradient_contents.cc
View File

@ -11,7 +11,6 @@
#include "impeller/entity/entity.h"
#include "impeller/geometry/gradient.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

2
engine/src/flutter/impeller/entity/contents/text_contents.cc
View File

@ -6,7 +6,6 @@
#include <cstring>
#include <optional>
#include <type_traits>
#include <utility>
#include "impeller/core/formats.h"
@ -14,7 +13,6 @@
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/entity.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/typographer/glyph_atlas.h"
#include "impeller/typographer/lazy_glyph_atlas.h"

1
engine/src/flutter/impeller/entity/contents/texture_contents.cc
View File

@ -16,7 +16,6 @@
#include "impeller/entity/texture_fill_external.frag.h"
#include "impeller/geometry/constants.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
namespace impeller {

3
engine/src/flutter/impeller/entity/contents/tiled_texture_contents.cc
View File

@ -8,13 +8,10 @@
#include "impeller/entity/contents/clip_contents.h"
#include "impeller/entity/contents/content_context.h"
#include "impeller/entity/geometry/geometry.h"
#include "impeller/entity/texture_fill.frag.h"
#include "impeller/entity/texture_fill.vert.h"
#include "impeller/entity/tiled_texture_fill.frag.h"
#include "impeller/entity/tiled_texture_fill_external.frag.h"
#include "impeller/geometry/path_builder.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

1
engine/src/flutter/impeller/entity/contents/vertices_contents.cc
View File

@ -10,7 +10,6 @@
#include "impeller/entity/vertices.frag.h"
#include "impeller/geometry/color.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

1
engine/src/flutter/impeller/playground/imgui/imgui_impl_impeller.cc
View File

@ -32,7 +32,6 @@
#include "impeller/renderer/pipeline_descriptor.h"
#include "impeller/renderer/pipeline_library.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/sampler_library.h"
struct ImGui_ImplImpeller_Data {
std::shared_ptr<impeller::Context> context;

1
engine/src/flutter/impeller/playground/playground.h
View File

@ -18,6 +18,7 @@
#include "impeller/image/compressed_image.h"
#include "impeller/image/decompressed_image.h"
#include "impeller/playground/switches.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/renderer.h"
#include "impeller/runtime_stage/runtime_stage.h"

1
engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.h
View File

@ -8,7 +8,6 @@
#include <unordered_map>
#include <vector>
#include "flutter/fml/macros.h"
#include "impeller/core/shader_types.h"
#include "impeller/renderer/backend/gles/gles.h"
#include "impeller/renderer/backend/gles/proc_table_gles.h"

1
engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.cc
View File

@ -11,7 +11,6 @@
#include "fml/closure.h"
#include "fml/logging.h"
#include "impeller/base/validation.h"
#include "impeller/core/texture_descriptor.h"
#include "impeller/renderer/backend/gles/context_gles.h"
#include "impeller/renderer/backend/gles/device_buffer_gles.h"
#include "impeller/renderer/backend/gles/formats_gles.h"

1
engine/src/flutter/impeller/renderer/backend/gles/render_pass_gles.h
View File

@ -7,7 +7,6 @@
#include <memory>
#include "flutter/fml/macros.h"
#include "flutter/impeller/renderer/backend/gles/reactor_gles.h"
#include "flutter/impeller/renderer/render_pass.h"

1
engine/src/flutter/impeller/renderer/backend/gles/sampler_library_gles.h
View File

@ -5,7 +5,6 @@
#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
#define FLUTTER_IMPELLER_RENDERER_BACKEND_GLES_SAMPLER_LIBRARY_GLES_H_
#include "flutter/fml/macros.h"
#include "impeller/core/sampler_descriptor.h"
#include "impeller/renderer/sampler_library.h"

3
engine/src/flutter/impeller/renderer/backend/vulkan/sampler_library_vk.h
View File

@ -5,12 +5,9 @@
#ifndef FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
#define FLUTTER_IMPELLER_RENDERER_BACKEND_VULKAN_SAMPLER_LIBRARY_VK_H_
#include "flutter/fml/macros.h"
#include "impeller/base/backend_cast.h"
#include "impeller/base/comparable.h"
#include "impeller/core/sampler_descriptor.h"
#include "impeller/renderer/backend/vulkan/device_holder.h"
#include "impeller/renderer/backend/vulkan/vk.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {

1
engine/src/flutter/impeller/renderer/command.h
View File

@ -6,7 +6,6 @@
#define FLUTTER_IMPELLER_RENDERER_COMMAND_H_
#include <cstdint>
#include <map>
#include <memory>
#include <optional>
#include <string>

3
engine/src/flutter/impeller/renderer/compute_pass.h
View File

@ -6,10 +6,7 @@
#define FLUTTER_IMPELLER_RENDERER_COMPUTE_PASS_H_
#include <string>
#include <variant>
#include "impeller/core/device_buffer.h"
#include "impeller/core/texture.h"
#include "impeller/renderer/compute_command.h"
namespace impeller {

4
engine/src/flutter/impeller/renderer/compute_pipeline_builder.h
View File

@ -5,15 +5,11 @@
#ifndef FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
#define FLUTTER_IMPELLER_RENDERER_COMPUTE_PIPELINE_BUILDER_H_
#include "flutter/fml/logging.h"
#include "flutter/fml/macros.h"
#include "impeller/base/strings.h"
#include "impeller/base/validation.h"
#include "impeller/core/formats.h"
#include "impeller/renderer/compute_pipeline_descriptor.h"
#include "impeller/renderer/context.h"
#include "impeller/renderer/shader_library.h"
#include "impeller/renderer/vertex_descriptor.h"
namespace impeller {

3
engine/src/flutter/impeller/renderer/context.h
View File

@ -8,18 +8,17 @@
#include <memory>
#include <string>
#include "flutter/fml/macros.h"
#include "impeller/core/allocator.h"
#include "impeller/core/capture.h"
#include "impeller/core/formats.h"
#include "impeller/core/host_buffer.h"
#include "impeller/renderer/capabilities.h"
#include "impeller/renderer/pool.h"
#include "impeller/renderer/sampler_library.h"
namespace impeller {
class ShaderLibrary;
class SamplerLibrary;
class CommandBuffer;
class PipelineLibrary;

2
engine/src/flutter/impeller/renderer/renderer.cc
View File

@ -6,9 +6,7 @@
#include <algorithm>
#include "flutter/fml/logging.h"
#include "flutter/fml/trace_event.h"
#include "impeller/base/validation.h"
#include "impeller/renderer/command_buffer.h"
#include "impeller/renderer/surface.h"

3
engine/src/flutter/impeller/renderer/renderer.h
View File

@ -8,16 +8,13 @@
#include <functional>
#include <memory>
#include "flutter/fml/macros.h"
#include "flutter/fml/synchronization/semaphore.h"
#include "impeller/geometry/size.h"
#include "impeller/renderer/context.h"
#include "impeller/renderer/render_target.h"
namespace impeller {
class Surface;
class RenderPass;
class Renderer {
public:

11
engine/src/flutter/impeller/renderer/renderer_unittests.cc
View File

@ -3,11 +3,9 @@
// found in the LICENSE file.
#include "flutter/fml/logging.h"
#include "flutter/testing/testing.h"
#include "impeller/base/strings.h"
#include "impeller/core/device_buffer_descriptor.h"
#include "impeller/core/formats.h"
#include "impeller/core/sampler.h"
#include "impeller/core/sampler_descriptor.h"
#include "impeller/fixtures/array.frag.h"
#include "impeller/fixtures/array.vert.h"
@ -23,20 +21,15 @@
#include "impeller/fixtures/instanced_draw.vert.h"
#include "impeller/fixtures/mipmaps.frag.h"
#include "impeller/fixtures/mipmaps.vert.h"
#include "impeller/fixtures/test_texture.frag.h"
#include "impeller/fixtures/test_texture.vert.h"
#include "impeller/geometry/path_builder.h"
#include "impeller/image/compressed_image.h"
#include "impeller/image/decompressed_image.h"
#include "impeller/playground/playground_test.h"
#include "impeller/renderer/command.h"
#include "impeller/renderer/command_buffer.h"
#include "impeller/renderer/pipeline_builder.h"
#include "impeller/renderer/pipeline_library.h"
#include "impeller/renderer/render_pass.h"
#include "impeller/renderer/render_target.h"
#include "impeller/renderer/renderer.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/surface.h"
#include "impeller/renderer/vertex_buffer_builder.h"
#include "impeller/tessellator/tessellator.h"
#include "third_party/imgui/imgui.h"

2
engine/src/flutter/impeller/scene/geometry.cc
View File

@ -4,7 +4,6 @@
#include "impeller/scene/geometry.h"
#include <iostream>
#include <memory>
#include <ostream>
@ -14,7 +13,6 @@
#include "impeller/core/vertex_buffer.h"
#include "impeller/geometry/point.h"
#include "impeller/geometry/vector.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/renderer/vertex_buffer_builder.h"
#include "impeller/scene/importer/scene_flatbuffers.h"
#include "impeller/scene/shaders/skinned.vert.h"

1
engine/src/flutter/impeller/scene/material.cc
View File

@ -6,7 +6,6 @@
#include "impeller/base/validation.h"
#include "impeller/core/formats.h"
#include "impeller/core/sampler_descriptor.h"
#include "impeller/renderer/sampler_library.h"
#include "impeller/scene/importer/conversions.h"
#include "impeller/scene/importer/scene_flatbuffers.h"
#include "impeller/scene/pipeline_key.h"

1
engine/src/flutter/lib/gpu/render_pass.cc
View File

@ -14,7 +14,6 @@
#include "impeller/core/vertex_buffer.h"
#include "impeller/geometry/color.h"
#include "impeller/renderer/pipeline_library.h"
#include "impeller/renderer/sampler_library.h"
#include "tonic/converter/dart_converter.h"
namespace flutter {