diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 6377aad2d8cb5..cf6bc16b71a90 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -1124,16 +1124,6 @@ ORIGIN: ../../../flutter/impeller/core/platform.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/core/platform.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/core/range.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/core/range.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/resource_binder.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/resource_binder.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/runtime_types.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/runtime_types.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/sampler.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/sampler.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/sampler_descriptor.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/sampler_descriptor.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/shader_types.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/core/shader_types.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/core/texture.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/core/texture.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/core/texture_descriptor.cc + ../../../flutter/LICENSE @@ -1558,6 +1548,10 @@ ORIGIN: ../../../flutter/impeller/renderer/render_target.cc + ../../../flutter/L ORIGIN: ../../../flutter/impeller/renderer/render_target.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/renderer.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/renderer.h + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/renderer/sampler.cc + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/renderer/sampler.h + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/renderer/sampler_descriptor.cc + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/renderer/sampler_descriptor.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/sampler_library.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/sampler_library.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/shader_function.cc + ../../../flutter/LICENSE @@ -1566,6 +1560,8 @@ ORIGIN: ../../../flutter/impeller/renderer/shader_key.cc + ../../../flutter/LICE ORIGIN: ../../../flutter/impeller/renderer/shader_key.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/shader_library.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/shader_library.h + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/renderer/shader_types.cc + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/renderer/shader_types.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/snapshot.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/snapshot.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/stroke.comp + ../../../flutter/LICENSE @@ -1580,6 +1576,8 @@ ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.fbs + ../../../flu ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.h + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_types.cc + ../../../flutter/LICENSE +ORIGIN: ../../../flutter/impeller/runtime_stage/runtime_types.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/scene/animation/animation.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/scene/animation/animation.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/scene/animation/animation_clip.cc + ../../../flutter/LICENSE @@ -3701,16 +3699,6 @@ FILE: ../../../flutter/impeller/core/platform.cc FILE: ../../../flutter/impeller/core/platform.h FILE: ../../../flutter/impeller/core/range.cc FILE: ../../../flutter/impeller/core/range.h -FILE: ../../../flutter/impeller/core/resource_binder.cc -FILE: ../../../flutter/impeller/core/resource_binder.h -FILE: ../../../flutter/impeller/core/runtime_types.cc -FILE: ../../../flutter/impeller/core/runtime_types.h -FILE: ../../../flutter/impeller/core/sampler.cc -FILE: ../../../flutter/impeller/core/sampler.h -FILE: ../../../flutter/impeller/core/sampler_descriptor.cc -FILE: ../../../flutter/impeller/core/sampler_descriptor.h -FILE: ../../../flutter/impeller/core/shader_types.cc -FILE: ../../../flutter/impeller/core/shader_types.h FILE: ../../../flutter/impeller/core/texture.cc FILE: ../../../flutter/impeller/core/texture.h FILE: ../../../flutter/impeller/core/texture_descriptor.cc @@ -4135,6 +4123,10 @@ FILE: ../../../flutter/impeller/renderer/render_target.cc FILE: ../../../flutter/impeller/renderer/render_target.h FILE: ../../../flutter/impeller/renderer/renderer.cc FILE: ../../../flutter/impeller/renderer/renderer.h +FILE: ../../../flutter/impeller/renderer/sampler.cc +FILE: ../../../flutter/impeller/renderer/sampler.h +FILE: ../../../flutter/impeller/renderer/sampler_descriptor.cc +FILE: ../../../flutter/impeller/renderer/sampler_descriptor.h FILE: ../../../flutter/impeller/renderer/sampler_library.cc FILE: ../../../flutter/impeller/renderer/sampler_library.h FILE: ../../../flutter/impeller/renderer/shader_function.cc @@ -4143,6 +4135,8 @@ FILE: ../../../flutter/impeller/renderer/shader_key.cc FILE: ../../../flutter/impeller/renderer/shader_key.h FILE: ../../../flutter/impeller/renderer/shader_library.cc FILE: ../../../flutter/impeller/renderer/shader_library.h +FILE: ../../../flutter/impeller/renderer/shader_types.cc +FILE: ../../../flutter/impeller/renderer/shader_types.h FILE: ../../../flutter/impeller/renderer/snapshot.cc FILE: ../../../flutter/impeller/renderer/snapshot.h FILE: ../../../flutter/impeller/renderer/stroke.comp @@ -4157,6 +4151,8 @@ FILE: ../../../flutter/impeller/runtime_stage/runtime_stage.fbs FILE: ../../../flutter/impeller/runtime_stage/runtime_stage.h FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.cc FILE: ../../../flutter/impeller/runtime_stage/runtime_stage_playground.h +FILE: ../../../flutter/impeller/runtime_stage/runtime_types.cc +FILE: ../../../flutter/impeller/runtime_stage/runtime_types.h FILE: ../../../flutter/impeller/scene/animation/animation.cc FILE: ../../../flutter/impeller/scene/animation/animation.h FILE: ../../../flutter/impeller/scene/animation/animation_clip.cc diff --git a/impeller/aiks/canvas.h b/impeller/aiks/canvas.h index 226ef14c8c576..80b9c74dc9564 100644 --- a/impeller/aiks/canvas.h +++ b/impeller/aiks/canvas.h @@ -13,13 +13,13 @@ #include "impeller/aiks/image.h" #include "impeller/aiks/paint.h" #include "impeller/aiks/picture.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/entity_pass.h" #include "impeller/entity/geometry.h" #include "impeller/geometry/matrix.h" #include "impeller/geometry/path.h" #include "impeller/geometry/point.h" #include "impeller/geometry/vector.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/typographer/glyph_atlas.h" #include "impeller/typographer/text_frame.h" diff --git a/impeller/compiler/code_gen_template.h b/impeller/compiler/code_gen_template.h index 4bea4aa37c64d..b7015b0457c7d 100644 --- a/impeller/compiler/code_gen_template.h +++ b/impeller/compiler/code_gen_template.h @@ -18,11 +18,13 @@ constexpr std::string_view kReflectionHeaderTemplate = {# file itself and the no-check declarations will be stripped in generated files.#} #include "impeller/core/buffer_view.h" {# // nogncheck #} -#include "impeller/core/sampler.h" {# // nogncheck #} +#include "impeller/renderer/command.h" {# // nogncheck #} -#include "impeller/core/shader_types.h" {# // nogncheck #} +#include "impeller/renderer/compute_command.h" {# // nogncheck #} -#include "impeller/core/resource_binder.h" {# // nogncheck #} +#include "impeller/renderer/sampler.h" {# // nogncheck #} + +#include "impeller/renderer/shader_types.h" {# // nogncheck #} #include "impeller/core/texture.h" {# // nogncheck #} diff --git a/impeller/compiler/reflector.cc b/impeller/compiler/reflector.cc index a65ccac6f58b0..bd1499df14a31 100644 --- a/impeller/compiler/reflector.cc +++ b/impeller/compiler/reflector.cc @@ -86,6 +86,21 @@ static std::string ExecutionModelToString(spv::ExecutionModel model) { } } +static std::string ExecutionModelToCommandTypeName( + spv::ExecutionModel execution_model) { + switch (execution_model) { + case spv::ExecutionModel::ExecutionModelVertex: + case spv::ExecutionModel::ExecutionModelFragment: + case spv::ExecutionModel::ExecutionModelTessellationControl: + case spv::ExecutionModel::ExecutionModelTessellationEvaluation: + return "Command&"; + case spv::ExecutionModel::ExecutionModelGLCompute: + return "ComputeCommand&"; + default: + return "unsupported"; + } +} + static std::string StringToShaderStage(std::string str) { if (str == "vertex") { return "ShaderStage::kVertex"; @@ -1085,7 +1100,7 @@ std::vector Reflector::ReflectBindPrototypes( proto.docstring = stream.str(); } proto.args.push_back(BindPrototypeArgument{ - .type_name = "ResourceBinder&", + .type_name = ExecutionModelToCommandTypeName(execution_model), .argument_name = "command", }); proto.args.push_back(BindPrototypeArgument{ @@ -1104,7 +1119,7 @@ std::vector Reflector::ReflectBindPrototypes( proto.docstring = stream.str(); } proto.args.push_back(BindPrototypeArgument{ - .type_name = "ResourceBinder&", + .type_name = ExecutionModelToCommandTypeName(execution_model), .argument_name = "command", }); proto.args.push_back(BindPrototypeArgument{ @@ -1123,7 +1138,7 @@ std::vector Reflector::ReflectBindPrototypes( proto.docstring = stream.str(); } proto.args.push_back(BindPrototypeArgument{ - .type_name = "ResourceBinder&", + .type_name = ExecutionModelToCommandTypeName(execution_model), .argument_name = "command", }); proto.args.push_back(BindPrototypeArgument{ diff --git a/impeller/core/BUILD.gn b/impeller/core/BUILD.gn index 68891ed145198..6b34c1326e5e4 100644 --- a/impeller/core/BUILD.gn +++ b/impeller/core/BUILD.gn @@ -24,16 +24,6 @@ impeller_component("core") { "platform.h", "range.cc", "range.h", - "resource_binder.cc", - "resource_binder.h", - "runtime_types.cc", - "runtime_types.h", - "sampler.cc", - "sampler.h", - "sampler_descriptor.cc", - "sampler_descriptor.h", - "shader_types.cc", - "shader_types.h", "texture.cc", "texture.h", "texture_descriptor.cc", diff --git a/impeller/core/resource_binder.cc b/impeller/core/resource_binder.cc deleted file mode 100644 index 6972ec45591b7..0000000000000 --- a/impeller/core/resource_binder.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "impeller/core/resource_binder.h" - -namespace impeller { - -// - -} // namespace impeller diff --git a/impeller/core/resource_binder.h b/impeller/core/resource_binder.h deleted file mode 100644 index d7e4f532a8e22..0000000000000 --- a/impeller/core/resource_binder.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2013 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#pragma once - -#include -#include -#include -#include - -#include "flutter/fml/logging.h" -#include "flutter/fml/macros.h" -#include "impeller/core/buffer_view.h" -#include "impeller/core/formats.h" -#include "impeller/core/sampler.h" -#include "impeller/core/shader_types.h" -#include "impeller/core/texture.h" - -namespace impeller { - -//------------------------------------------------------------------------------ -/// @brief An interface for binding resources. This is implemented by -/// |Command| and |ComputeCommand| to make CPU resources available -/// to the GPU. -/// -struct ResourceBinder { - virtual ~ResourceBinder() = default; - - virtual bool BindResource(ShaderStage stage, - const ShaderUniformSlot& slot, - const ShaderMetadata& metadata, - const BufferView& view) = 0; - - virtual bool BindResource(ShaderStage stage, - const SampledImageSlot& slot, - const ShaderMetadata& metadata, - const std::shared_ptr& texture) = 0; - - virtual bool BindResource(ShaderStage stage, - const SampledImageSlot& slot, - const ShaderMetadata& metadata, - const std::shared_ptr& sampler) = 0; - - virtual bool BindResource(ShaderStage stage, - const SampledImageSlot& slot, - const ShaderMetadata& metadata, - const std::shared_ptr& texture, - const std::shared_ptr& sampler) = 0; -}; - -} // namespace impeller diff --git a/impeller/display_list/nine_patch_converter.h b/impeller/display_list/nine_patch_converter.h index 422a8943a0bd6..6795f4dc7feb8 100644 --- a/impeller/display_list/nine_patch_converter.h +++ b/impeller/display_list/nine_patch_converter.h @@ -10,8 +10,8 @@ #include "impeller/aiks/canvas.h" #include "impeller/aiks/image.h" #include "impeller/aiks/paint.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/geometry/path.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/entity/contents/atlas_contents.h b/impeller/entity/contents/atlas_contents.h index 44a31e12be215..67fa20ef66fdf 100644 --- a/impeller/entity/contents/atlas_contents.h +++ b/impeller/entity/contents/atlas_contents.h @@ -9,9 +9,9 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/contents/contents.h" #include "impeller/entity/entity.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/entity/contents/color_source_contents.cc b/impeller/entity/contents/color_source_contents.cc index 12918b3ac6d3c..4eef31d6e9f9f 100644 --- a/impeller/entity/contents/color_source_contents.cc +++ b/impeller/entity/contents/color_source_contents.cc @@ -2,11 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "impeller/entity/contents/color_source_contents.h" +#include "color_source_contents.h" #include "impeller/entity/entity.h" #include "impeller/geometry/matrix.h" -#include "impeller/geometry/point.h" namespace impeller { diff --git a/impeller/entity/contents/contents.h b/impeller/entity/contents/contents.h index 3d22803a6de26..1d444e57f7bb4 100644 --- a/impeller/entity/contents/contents.h +++ b/impeller/entity/contents/contents.h @@ -9,10 +9,10 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/core/texture.h" #include "impeller/geometry/color.h" #include "impeller/geometry/rect.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/snapshot.h" namespace impeller { diff --git a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc index fb5e6ad498fcf..e98af38f7edce 100644 --- a/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc +++ b/impeller/entity/contents/filters/gaussian_blur_filter_contents.cc @@ -11,7 +11,6 @@ #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" #include "impeller/entity/contents/filters/filter_contents.h" #include "impeller/geometry/rect.h" @@ -19,6 +18,7 @@ #include "impeller/renderer/command_buffer.h" #include "impeller/renderer/render_pass.h" #include "impeller/renderer/render_target.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" namespace impeller { diff --git a/impeller/entity/contents/gradient_generator.h b/impeller/entity/contents/gradient_generator.h index 24321d861218f..11cff7883da8e 100644 --- a/impeller/entity/contents/gradient_generator.h +++ b/impeller/entity/contents/gradient_generator.h @@ -10,11 +10,11 @@ #include "flutter/fml/macros.h" #include "flutter/impeller/core/texture.h" -#include "impeller/core/shader_types.h" #include "impeller/geometry/color.h" #include "impeller/geometry/gradient.h" #include "impeller/geometry/path.h" #include "impeller/geometry/point.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/entity/contents/runtime_effect_contents.cc b/impeller/entity/contents/runtime_effect_contents.cc index df9fa0547ce61..4b9f64d914e29 100644 --- a/impeller/entity/contents/runtime_effect_contents.cc +++ b/impeller/entity/contents/runtime_effect_contents.cc @@ -11,7 +11,6 @@ #include "flutter/fml/make_copyable.h" #include "impeller/base/validation.h" #include "impeller/core/formats.h" -#include "impeller/core/shader_types.h" #include "impeller/entity/contents/clip_contents.h" #include "impeller/entity/contents/content_context.h" #include "impeller/entity/runtime_effect.vert.h" @@ -19,6 +18,7 @@ #include "impeller/renderer/render_pass.h" #include "impeller/renderer/sampler_library.h" #include "impeller/renderer/shader_function.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/entity/contents/runtime_effect_contents.h b/impeller/entity/contents/runtime_effect_contents.h index 0a85d5ae4bca9..a1baab42d6e34 100644 --- a/impeller/entity/contents/runtime_effect_contents.h +++ b/impeller/entity/contents/runtime_effect_contents.h @@ -6,8 +6,8 @@ #include #include -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/contents/color_source_contents.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/runtime_stage/runtime_stage.h" namespace impeller { diff --git a/impeller/entity/contents/text_contents.cc b/impeller/entity/contents/text_contents.cc index 617d1a64ee6a2..e77ee50d76808 100644 --- a/impeller/entity/contents/text_contents.cc +++ b/impeller/entity/contents/text_contents.cc @@ -9,11 +9,11 @@ #include #include "impeller/core/formats.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/contents/content_context.h" #include "impeller/entity/entity.h" #include "impeller/geometry/path_builder.h" #include "impeller/renderer/render_pass.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" #include "impeller/tessellator/tessellator.h" #include "impeller/typographer/glyph_atlas.h" diff --git a/impeller/entity/contents/texture_contents.h b/impeller/entity/contents/texture_contents.h index 56600978e5ac2..2dd485f5f1e5c 100644 --- a/impeller/entity/contents/texture_contents.h +++ b/impeller/entity/contents/texture_contents.h @@ -9,9 +9,9 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/contents/contents.h" #include "impeller/geometry/path.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/entity/contents/tiled_texture_contents.h b/impeller/entity/contents/tiled_texture_contents.h index d221adfa5f6e2..9aa7755d9041f 100644 --- a/impeller/entity/contents/tiled_texture_contents.h +++ b/impeller/entity/contents/tiled_texture_contents.h @@ -9,11 +9,11 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/contents/color_source_contents.h" #include "impeller/entity/contents/filters/color_filter_contents.h" #include "impeller/entity/entity.h" #include "impeller/geometry/path.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/entity/contents/vertices_contents.h b/impeller/entity/contents/vertices_contents.h index 1ba524899cff4..88facd3b4b8bd 100644 --- a/impeller/entity/contents/vertices_contents.h +++ b/impeller/entity/contents/vertices_contents.h @@ -9,13 +9,13 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/entity/contents/contents.h" #include "impeller/entity/entity.h" #include "impeller/entity/geometry.h" #include "impeller/geometry/color.h" #include "impeller/geometry/path.h" #include "impeller/geometry/point.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/entity/geometry.h b/impeller/entity/geometry.h index bcf9190766a32..5061dc19f7cb3 100644 --- a/impeller/entity/geometry.h +++ b/impeller/entity/geometry.h @@ -12,9 +12,6 @@ #include "impeller/entity/solid_fill.vert.h" #include "impeller/geometry/color.h" #include "impeller/geometry/path.h" -#include "impeller/geometry/point.h" -#include "impeller/geometry/scalar.h" -#include "impeller/renderer/vertex_buffer_builder.h" namespace impeller { diff --git a/impeller/playground/imgui/imgui_impl_impeller.cc b/impeller/playground/imgui/imgui_impl_impeller.cc index 1024e56c053ce..e8c58325dbaae 100644 --- a/impeller/playground/imgui/imgui_impl_impeller.cc +++ b/impeller/playground/imgui/imgui_impl_impeller.cc @@ -18,7 +18,6 @@ #include "impeller/core/allocator.h" #include "impeller/core/formats.h" #include "impeller/core/range.h" -#include "impeller/core/sampler.h" #include "impeller/core/texture.h" #include "impeller/core/texture_descriptor.h" #include "impeller/core/vertex_buffer.h" @@ -32,6 +31,7 @@ #include "impeller/renderer/pipeline_descriptor.h" #include "impeller/renderer/pipeline_library.h" #include "impeller/renderer/render_pass.h" +#include "impeller/renderer/sampler.h" #include "impeller/renderer/sampler_library.h" struct ImGui_ImplImpeller_Data { diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn index 3e1cc1a5de95d..e1f9c5532b8d8 100644 --- a/impeller/renderer/BUILD.gn +++ b/impeller/renderer/BUILD.gn @@ -78,6 +78,10 @@ impeller_component("renderer") { "render_target.h", "renderer.cc", "renderer.h", + "sampler.cc", + "sampler.h", + "sampler_descriptor.cc", + "sampler_descriptor.h", "sampler_library.cc", "sampler_library.h", "shader_function.cc", @@ -86,6 +90,8 @@ impeller_component("renderer") { "shader_key.h", "shader_library.cc", "shader_library.h", + "shader_types.cc", + "shader_types.h", "snapshot.cc", "snapshot.h", "surface.cc", diff --git a/impeller/renderer/backend/gles/capabilities_gles.h b/impeller/renderer/backend/gles/capabilities_gles.h index edcfb99892c9c..5cce9125cac1c 100644 --- a/impeller/renderer/backend/gles/capabilities_gles.h +++ b/impeller/renderer/backend/gles/capabilities_gles.h @@ -7,8 +7,8 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/shader_types.h" #include "impeller/geometry/size.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/backend/gles/formats_gles.h b/impeller/renderer/backend/gles/formats_gles.h index fa44297ba50e8..ef4cc418a76c2 100644 --- a/impeller/renderer/backend/gles/formats_gles.h +++ b/impeller/renderer/backend/gles/formats_gles.h @@ -7,8 +7,8 @@ #include "flutter/fml/logging.h" #include "flutter/fml/macros.h" #include "impeller/core/formats.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/gles/gles.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/backend/gles/sampler_gles.h b/impeller/renderer/backend/gles/sampler_gles.h index bb318f6a35278..7fa58daa45215 100644 --- a/impeller/renderer/backend/gles/sampler_gles.h +++ b/impeller/renderer/backend/gles/sampler_gles.h @@ -6,7 +6,7 @@ #include "flutter/fml/macros.h" #include "impeller/base/backend_cast.h" -#include "impeller/core/sampler.h" +#include "impeller/renderer/sampler.h" namespace impeller { diff --git a/impeller/renderer/backend/gles/sampler_library_gles.h b/impeller/renderer/backend/gles/sampler_library_gles.h index 43794426d9ed5..9bf35d6740ec8 100644 --- a/impeller/renderer/backend/gles/sampler_library_gles.h +++ b/impeller/renderer/backend/gles/sampler_library_gles.h @@ -5,7 +5,7 @@ #pragma once #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/blit_pass_mtl.mm b/impeller/renderer/backend/metal/blit_pass_mtl.mm index b884d01c0c151..ddbba0772c219 100644 --- a/impeller/renderer/backend/metal/blit_pass_mtl.mm +++ b/impeller/renderer/backend/metal/blit_pass_mtl.mm @@ -13,7 +13,6 @@ #include "impeller/base/backend_cast.h" #include "impeller/core/formats.h" #include "impeller/core/host_buffer.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/metal/blit_command_mtl.h" #include "impeller/renderer/backend/metal/device_buffer_mtl.h" #include "impeller/renderer/backend/metal/formats_mtl.h" @@ -21,6 +20,7 @@ #include "impeller/renderer/backend/metal/sampler_mtl.h" #include "impeller/renderer/backend/metal/texture_mtl.h" #include "impeller/renderer/blit_command.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/compute_pass_mtl.mm b/impeller/renderer/backend/metal/compute_pass_mtl.mm index 3a610acd154d4..204e2a2c886af 100644 --- a/impeller/renderer/backend/metal/compute_pass_mtl.mm +++ b/impeller/renderer/backend/metal/compute_pass_mtl.mm @@ -15,13 +15,13 @@ #include "impeller/base/backend_cast.h" #include "impeller/core/formats.h" #include "impeller/core/host_buffer.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/metal/compute_pipeline_mtl.h" #include "impeller/renderer/backend/metal/device_buffer_mtl.h" #include "impeller/renderer/backend/metal/formats_mtl.h" #include "impeller/renderer/backend/metal/sampler_mtl.h" #include "impeller/renderer/backend/metal/texture_mtl.h" #include "impeller/renderer/compute_command.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/context_mtl.h b/impeller/renderer/backend/metal/context_mtl.h index 26ba5ace3fead..ac5de3a66bac9 100644 --- a/impeller/renderer/backend/metal/context_mtl.h +++ b/impeller/renderer/backend/metal/context_mtl.h @@ -11,7 +11,6 @@ #include "flutter/fml/macros.h" #include "impeller/base/backend_cast.h" -#include "impeller/core/sampler.h" #include "impeller/renderer/backend/metal/allocator_mtl.h" #include "impeller/renderer/backend/metal/command_buffer_mtl.h" #include "impeller/renderer/backend/metal/gpu_tracer_mtl.h" @@ -19,6 +18,7 @@ #include "impeller/renderer/backend/metal/shader_library_mtl.h" #include "impeller/renderer/capabilities.h" #include "impeller/renderer/context.h" +#include "impeller/renderer/sampler.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/context_mtl.mm b/impeller/renderer/backend/metal/context_mtl.mm index f72d3162438af..c8b52eebb6d68 100644 --- a/impeller/renderer/backend/metal/context_mtl.mm +++ b/impeller/renderer/backend/metal/context_mtl.mm @@ -9,9 +9,9 @@ #include "flutter/fml/file.h" #include "flutter/fml/logging.h" #include "flutter/fml/paths.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/renderer/backend/metal/sampler_library_mtl.h" #include "impeller/renderer/capabilities.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/render_pass_mtl.mm b/impeller/renderer/backend/metal/render_pass_mtl.mm index 4c912e9772935..540309532ff26 100644 --- a/impeller/renderer/backend/metal/render_pass_mtl.mm +++ b/impeller/renderer/backend/metal/render_pass_mtl.mm @@ -10,12 +10,12 @@ #include "impeller/base/backend_cast.h" #include "impeller/core/formats.h" #include "impeller/core/host_buffer.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/metal/device_buffer_mtl.h" #include "impeller/renderer/backend/metal/formats_mtl.h" #include "impeller/renderer/backend/metal/pipeline_mtl.h" #include "impeller/renderer/backend/metal/sampler_mtl.h" #include "impeller/renderer/backend/metal/texture_mtl.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/sampler_library_mtl.h b/impeller/renderer/backend/metal/sampler_library_mtl.h index d72cc11a0c3c7..74297ebcb5320 100644 --- a/impeller/renderer/backend/metal/sampler_library_mtl.h +++ b/impeller/renderer/backend/metal/sampler_library_mtl.h @@ -11,7 +11,7 @@ #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/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" namespace impeller { diff --git a/impeller/renderer/backend/metal/sampler_mtl.h b/impeller/renderer/backend/metal/sampler_mtl.h index 22f548e368729..dc26deff68108 100644 --- a/impeller/renderer/backend/metal/sampler_mtl.h +++ b/impeller/renderer/backend/metal/sampler_mtl.h @@ -8,7 +8,7 @@ #include "flutter/fml/macros.h" #include "impeller/base/backend_cast.h" -#include "impeller/core/sampler.h" +#include "impeller/renderer/sampler.h" namespace impeller { diff --git a/impeller/renderer/backend/vulkan/formats_vk.h b/impeller/renderer/backend/vulkan/formats_vk.h index 3b359332b29d3..16931d4132dbd 100644 --- a/impeller/renderer/backend/vulkan/formats_vk.h +++ b/impeller/renderer/backend/vulkan/formats_vk.h @@ -6,8 +6,8 @@ #include "flutter/fml/macros.h" #include "impeller/core/formats.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/vulkan/vk.h" +#include "impeller/renderer/shader_types.h" #include "vulkan/vulkan_enums.hpp" namespace impeller { diff --git a/impeller/renderer/backend/vulkan/render_pass_vk.cc b/impeller/renderer/backend/vulkan/render_pass_vk.cc index 23adb1829ba33..8553aebd0c3f4 100644 --- a/impeller/renderer/backend/vulkan/render_pass_vk.cc +++ b/impeller/renderer/backend/vulkan/render_pass_vk.cc @@ -13,8 +13,6 @@ #include "flutter/fml/trace_event.h" #include "impeller/base/validation.h" #include "impeller/core/formats.h" -#include "impeller/core/sampler.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/vulkan/command_encoder_vk.h" #include "impeller/renderer/backend/vulkan/context_vk.h" #include "impeller/renderer/backend/vulkan/device_buffer_vk.h" @@ -23,6 +21,8 @@ #include "impeller/renderer/backend/vulkan/sampler_vk.h" #include "impeller/renderer/backend/vulkan/shared_object_vk.h" #include "impeller/renderer/backend/vulkan/texture_vk.h" +#include "impeller/renderer/sampler.h" +#include "impeller/renderer/shader_types.h" #include "vulkan/vulkan_enums.hpp" #include "vulkan/vulkan_structs.hpp" diff --git a/impeller/renderer/backend/vulkan/sampler_library_vk.h b/impeller/renderer/backend/vulkan/sampler_library_vk.h index 8b5a4fca82fe3..72129ca496757 100644 --- a/impeller/renderer/backend/vulkan/sampler_library_vk.h +++ b/impeller/renderer/backend/vulkan/sampler_library_vk.h @@ -7,8 +7,8 @@ #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/vk.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" namespace impeller { diff --git a/impeller/renderer/backend/vulkan/sampler_vk.h b/impeller/renderer/backend/vulkan/sampler_vk.h index f67a64f9e83d6..bf78d63a1b271 100644 --- a/impeller/renderer/backend/vulkan/sampler_vk.h +++ b/impeller/renderer/backend/vulkan/sampler_vk.h @@ -6,9 +6,9 @@ #include "flutter/fml/macros.h" #include "impeller/base/backend_cast.h" -#include "impeller/core/sampler.h" #include "impeller/renderer/backend/vulkan/shared_object_vk.h" #include "impeller/renderer/backend/vulkan/vk.h" +#include "impeller/renderer/sampler.h" #include "vulkan/vulkan_handles.hpp" namespace impeller { diff --git a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h index 31d3f447c7d61..519dd2e7f3a03 100644 --- a/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h +++ b/impeller/renderer/backend/vulkan/vertex_descriptor_vk.h @@ -5,8 +5,8 @@ #pragma once #include "flutter/fml/macros.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/backend/vulkan/vk.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/command.h b/impeller/renderer/command.h index a75083ddc629f..aa219dfd5fc25 100644 --- a/impeller/renderer/command.h +++ b/impeller/renderer/command.h @@ -13,13 +13,12 @@ #include "flutter/fml/macros.h" #include "impeller/core/buffer_view.h" #include "impeller/core/formats.h" -#include "impeller/core/resource_binder.h" -#include "impeller/core/sampler.h" -#include "impeller/core/shader_types.h" #include "impeller/core/texture.h" #include "impeller/core/vertex_buffer.h" #include "impeller/geometry/rect.h" #include "impeller/renderer/pipeline.h" +#include "impeller/renderer/sampler.h" +#include "impeller/renderer/shader_types.h" #include "impeller/renderer/vertex_buffer_builder.h" #include "impeller/tessellator/tessellator.h" @@ -64,7 +63,7 @@ struct Bindings { /// views into buffers managed by other allocators and resource /// managers. /// -struct Command : public ResourceBinder { +struct Command { //---------------------------------------------------------------------------- /// The pipeline to use for this command. /// @@ -146,30 +145,26 @@ struct Command : public ResourceBinder { /// bool BindVertices(const VertexBuffer& buffer); - // |ResourceBinder| bool BindResource(ShaderStage stage, const ShaderUniformSlot& slot, const ShaderMetadata& metadata, - const BufferView& view) override; + const BufferView& view); - // |ResourceBinder| bool BindResource(ShaderStage stage, const SampledImageSlot& slot, const ShaderMetadata& metadata, - const std::shared_ptr& texture) override; + const std::shared_ptr& texture); - // |ResourceBinder| bool BindResource(ShaderStage stage, const SampledImageSlot& slot, const ShaderMetadata& metadata, - const std::shared_ptr& sampler) override; + const std::shared_ptr& sampler); - // |ResourceBinder| bool BindResource(ShaderStage stage, const SampledImageSlot& slot, const ShaderMetadata& metadata, const std::shared_ptr& texture, - const std::shared_ptr& sampler) override; + const std::shared_ptr& sampler); BufferView GetVertexBuffer() const; diff --git a/impeller/renderer/compute_command.h b/impeller/renderer/compute_command.h index 467777d22deda..15ee42f98a5d8 100644 --- a/impeller/renderer/compute_command.h +++ b/impeller/renderer/compute_command.h @@ -13,15 +13,14 @@ #include "flutter/fml/macros.h" #include "impeller/core/buffer_view.h" #include "impeller/core/formats.h" -#include "impeller/core/resource_binder.h" -#include "impeller/core/sampler.h" -#include "impeller/core/shader_types.h" #include "impeller/core/texture.h" #include "impeller/core/vertex_buffer.h" #include "impeller/geometry/rect.h" #include "impeller/renderer/command.h" #include "impeller/renderer/compute_pipeline_descriptor.h" #include "impeller/renderer/pipeline.h" +#include "impeller/renderer/sampler.h" +#include "impeller/renderer/shader_types.h" #include "impeller/renderer/vertex_buffer_builder.h" #include "impeller/tessellator/tessellator.h" @@ -40,7 +39,7 @@ namespace impeller { /// views into buffers managed by other allocators and resource /// managers. /// -struct ComputeCommand : public ResourceBinder { +struct ComputeCommand { //---------------------------------------------------------------------------- /// The pipeline to use for this command. /// @@ -55,30 +54,26 @@ struct ComputeCommand : public ResourceBinder { /// std::string label; - // |ResourceBinder| bool BindResource(ShaderStage stage, const ShaderUniformSlot& slot, const ShaderMetadata& metadata, - const BufferView& view) override; + const BufferView& view); - // |ResourceBinder| bool BindResource(ShaderStage stage, const SampledImageSlot& slot, const ShaderMetadata& metadata, - const std::shared_ptr& texture) override; + const std::shared_ptr& texture); - // |ResourceBinder| bool BindResource(ShaderStage stage, const SampledImageSlot& slot, const ShaderMetadata& metadata, - const std::shared_ptr& sampler) override; + const std::shared_ptr& sampler); - // |ResourceBinder| bool BindResource(ShaderStage stage, const SampledImageSlot& slot, const ShaderMetadata& metadata, const std::shared_ptr& texture, - const std::shared_ptr& sampler) override; + const std::shared_ptr& sampler); constexpr operator bool() const { return pipeline && pipeline->IsValid(); } }; diff --git a/impeller/renderer/compute_pipeline_descriptor.h b/impeller/renderer/compute_pipeline_descriptor.h index 9886d2691ddf8..5bd513f43c863 100644 --- a/impeller/renderer/compute_pipeline_descriptor.h +++ b/impeller/renderer/compute_pipeline_descriptor.h @@ -17,7 +17,7 @@ #include "flutter/fml/macros.h" #include "impeller/base/comparable.h" #include "impeller/core/formats.h" -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" #include "impeller/tessellator/tessellator.h" namespace impeller { diff --git a/impeller/renderer/pipeline_descriptor.h b/impeller/renderer/pipeline_descriptor.h index 3d0eddf880e28..552fcfedf23c0 100644 --- a/impeller/renderer/pipeline_descriptor.h +++ b/impeller/renderer/pipeline_descriptor.h @@ -17,7 +17,7 @@ #include "flutter/fml/macros.h" #include "impeller/base/comparable.h" #include "impeller/core/formats.h" -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" #include "impeller/tessellator/tessellator.h" namespace impeller { diff --git a/impeller/renderer/renderer_unittests.cc b/impeller/renderer/renderer_unittests.cc index e995aaea2cec4..9705fc7864043 100644 --- a/impeller/renderer/renderer_unittests.cc +++ b/impeller/renderer/renderer_unittests.cc @@ -6,8 +6,6 @@ #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" #include "impeller/fixtures/box_fade.frag.h" @@ -33,6 +31,8 @@ #include "impeller/renderer/pipeline_builder.h" #include "impeller/renderer/pipeline_library.h" #include "impeller/renderer/renderer.h" +#include "impeller/renderer/sampler.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" #include "impeller/renderer/surface.h" #include "impeller/renderer/vertex_buffer_builder.h" diff --git a/impeller/core/sampler.cc b/impeller/renderer/sampler.cc similarity index 90% rename from impeller/core/sampler.cc rename to impeller/renderer/sampler.cc index 12b87d3e91b1a..47d44e8996c3d 100644 --- a/impeller/core/sampler.cc +++ b/impeller/renderer/sampler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "impeller/core/sampler.h" +#include "impeller/renderer/sampler.h" namespace impeller { diff --git a/impeller/core/sampler.h b/impeller/renderer/sampler.h similarity index 91% rename from impeller/core/sampler.h rename to impeller/renderer/sampler.h index 3dd19cf71fed8..41a16f5b74865 100644 --- a/impeller/core/sampler.h +++ b/impeller/renderer/sampler.h @@ -5,7 +5,7 @@ #pragma once #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/core/sampler_descriptor.cc b/impeller/renderer/sampler_descriptor.cc similarity index 92% rename from impeller/core/sampler_descriptor.cc rename to impeller/renderer/sampler_descriptor.cc index 9e99089813dd3..b2e10cab10d49 100644 --- a/impeller/core/sampler_descriptor.cc +++ b/impeller/renderer/sampler_descriptor.cc @@ -2,8 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "impeller/core/sampler_descriptor.h" - +#include "impeller/renderer/sampler_descriptor.h" #include "fml/logging.h" namespace impeller { diff --git a/impeller/core/sampler_descriptor.h b/impeller/renderer/sampler_descriptor.h similarity index 100% rename from impeller/core/sampler_descriptor.h rename to impeller/renderer/sampler_descriptor.h diff --git a/impeller/renderer/sampler_library.h b/impeller/renderer/sampler_library.h index 777420776dc62..e515b6facab36 100644 --- a/impeller/renderer/sampler_library.h +++ b/impeller/renderer/sampler_library.h @@ -7,7 +7,7 @@ #include #include "flutter/fml/macros.h" -#include "impeller/core/sampler_descriptor.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/renderer/shader_function.h b/impeller/renderer/shader_function.h index a271496e0762e..273b280f068b2 100644 --- a/impeller/renderer/shader_function.h +++ b/impeller/renderer/shader_function.h @@ -7,7 +7,7 @@ #include "flutter/fml/hash_combine.h" #include "flutter/fml/macros.h" #include "impeller/base/comparable.h" -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/shader_key.h b/impeller/renderer/shader_key.h index 802908647b149..24e7c0a455a72 100644 --- a/impeller/renderer/shader_key.h +++ b/impeller/renderer/shader_key.h @@ -10,7 +10,7 @@ #include "flutter/fml/hash_combine.h" #include "flutter/fml/macros.h" -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/renderer/shader_library.h b/impeller/renderer/shader_library.h index 76b1aeb8cd499..3c1b4f9a730d3 100644 --- a/impeller/renderer/shader_library.h +++ b/impeller/renderer/shader_library.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "fml/mapping.h" -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/core/shader_types.cc b/impeller/renderer/shader_types.cc similarity index 83% rename from impeller/core/shader_types.cc rename to impeller/renderer/shader_types.cc index 8018c18eef0e6..f49b27cc45e68 100644 --- a/impeller/core/shader_types.cc +++ b/impeller/renderer/shader_types.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/core/shader_types.h b/impeller/renderer/shader_types.h similarity index 98% rename from impeller/core/shader_types.h rename to impeller/renderer/shader_types.h index ad7cddbb5104c..8767924b42271 100644 --- a/impeller/core/shader_types.h +++ b/impeller/renderer/shader_types.h @@ -11,9 +11,9 @@ #include "flutter/fml/hash_combine.h" #include "flutter/fml/logging.h" -#include "impeller/core/runtime_types.h" #include "impeller/geometry/half.h" #include "impeller/geometry/matrix.h" +#include "impeller/runtime_stage/runtime_types.h" namespace impeller { diff --git a/impeller/renderer/snapshot.h b/impeller/renderer/snapshot.h index 0d9a57471aaaa..6d2d2fb74f085 100644 --- a/impeller/renderer/snapshot.h +++ b/impeller/renderer/snapshot.h @@ -10,10 +10,10 @@ #include "flutter/fml/macros.h" #include "impeller/core/formats.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/core/texture.h" #include "impeller/geometry/matrix.h" #include "impeller/geometry/rect.h" +#include "impeller/renderer/sampler_descriptor.h" namespace impeller { diff --git a/impeller/renderer/vertex_descriptor.h b/impeller/renderer/vertex_descriptor.h index 19d9b9d1bfd9e..8d145bb0f503e 100644 --- a/impeller/renderer/vertex_descriptor.h +++ b/impeller/renderer/vertex_descriptor.h @@ -8,7 +8,7 @@ #include "flutter/fml/macros.h" #include "impeller/base/comparable.h" -#include "impeller/core/shader_types.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/runtime_stage/BUILD.gn b/impeller/runtime_stage/BUILD.gn index f5768280d6d6b..5756887562edb 100644 --- a/impeller/runtime_stage/BUILD.gn +++ b/impeller/runtime_stage/BUILD.gn @@ -20,11 +20,12 @@ impeller_component("runtime_stage") { sources = [ "runtime_stage.cc", "runtime_stage.h", + "runtime_types.cc", + "runtime_types.h", ] public_deps = [ ":runtime_stage_flatbuffers", "../base", - "../core", "//flutter/fml", ] } diff --git a/impeller/runtime_stage/runtime_stage.h b/impeller/runtime_stage/runtime_stage.h index f3a795c0caeb3..2c5eca0e3badd 100644 --- a/impeller/runtime_stage/runtime_stage.h +++ b/impeller/runtime_stage/runtime_stage.h @@ -10,7 +10,7 @@ #include "flutter/fml/macros.h" #include "flutter/fml/mapping.h" -#include "flutter/impeller/core/runtime_types.h" +#include "flutter/impeller/runtime_stage/runtime_types.h" namespace impeller { diff --git a/impeller/runtime_stage/runtime_stage_playground.cc b/impeller/runtime_stage/runtime_stage_playground.cc index 3762581e85213..de0d3cf66f99e 100644 --- a/impeller/runtime_stage/runtime_stage_playground.cc +++ b/impeller/runtime_stage/runtime_stage_playground.cc @@ -8,8 +8,8 @@ #include "flutter/fml/make_copyable.h" #include "flutter/testing/testing.h" -#include "impeller/core/shader_types.h" #include "impeller/renderer/shader_library.h" +#include "impeller/renderer/shader_types.h" namespace impeller { diff --git a/impeller/runtime_stage/runtime_stage_unittests.cc b/impeller/runtime_stage/runtime_stage_unittests.cc index fbe4d5f447eee..d5596afa6748f 100644 --- a/impeller/runtime_stage/runtime_stage_unittests.cc +++ b/impeller/runtime_stage/runtime_stage_unittests.cc @@ -9,11 +9,11 @@ #include "flutter/testing/testing.h" #include "impeller/base/allocation.h" #include "impeller/base/validation.h" -#include "impeller/core/shader_types.h" #include "impeller/playground/playground.h" #include "impeller/renderer/pipeline_descriptor.h" #include "impeller/renderer/pipeline_library.h" #include "impeller/renderer/shader_library.h" +#include "impeller/renderer/shader_types.h" #include "impeller/runtime_stage/runtime_stage.h" #include "impeller/runtime_stage/runtime_stage_playground.h" diff --git a/impeller/core/runtime_types.cc b/impeller/runtime_stage/runtime_types.cc similarity index 89% rename from impeller/core/runtime_types.cc rename to impeller/runtime_stage/runtime_types.cc index 0c530699ecda3..4236eae89bbfc 100644 --- a/impeller/core/runtime_types.cc +++ b/impeller/runtime_stage/runtime_types.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "impeller/core/runtime_types.h" +#include "impeller/runtime_stage/runtime_types.h" namespace impeller { diff --git a/impeller/core/runtime_types.h b/impeller/runtime_stage/runtime_types.h similarity index 100% rename from impeller/core/runtime_types.h rename to impeller/runtime_stage/runtime_types.h diff --git a/impeller/scene/geometry.cc b/impeller/scene/geometry.cc index 4804377850a66..016211499aa95 100644 --- a/impeller/scene/geometry.cc +++ b/impeller/scene/geometry.cc @@ -10,10 +10,10 @@ #include "impeller/core/device_buffer_descriptor.h" #include "impeller/core/formats.h" -#include "impeller/core/sampler_descriptor.h" #include "impeller/core/vertex_buffer.h" #include "impeller/geometry/point.h" #include "impeller/geometry/vector.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" #include "impeller/renderer/vertex_buffer_builder.h" #include "impeller/scene/importer/scene_flatbuffers.h" diff --git a/impeller/scene/material.cc b/impeller/scene/material.cc index d4f4c7161f3c8..1e3493dadd3e5 100644 --- a/impeller/scene/material.cc +++ b/impeller/scene/material.cc @@ -5,7 +5,7 @@ #include "impeller/scene/material.h" #include "impeller/base/validation.h" #include "impeller/core/formats.h" -#include "impeller/core/sampler_descriptor.h" +#include "impeller/renderer/sampler_descriptor.h" #include "impeller/renderer/sampler_library.h" #include "impeller/scene/importer/conversions.h" #include "impeller/scene/importer/scene_flatbuffers.h"