Remove some trivial forward declares from Impeller (flutter/engine#48635)

Towards https://github.com/flutter/flutter/issues/133417#issuecomment-1839273553

I'll request a test exemption for this as it's a semantics-only refactor.

There are still a bunch of other forward declares in Impeller that make things confusing for tooling, but some of those will require less trivial changes to interfaces.
This commit is contained in:
Dan Field 2023-12-04 12:53:06 -08:00 committed by GitHub
parent 20e5300477
commit 112e8a2d4b
8 changed files with 11 additions and 18 deletions

View File

@ -15,7 +15,6 @@
namespace impeller {
struct Picture;
class RenderPass;
class AiksContext {
public:

View File

@ -15,6 +15,7 @@
#include "impeller/aiks/paint.h"
#include "impeller/aiks/picture.h"
#include "impeller/core/sampler_descriptor.h"
#include "impeller/entity/entity.h"
#include "impeller/entity/entity_pass.h"
#include "impeller/entity/geometry/geometry.h"
#include "impeller/entity/geometry/vertices_geometry.h"
@ -26,8 +27,6 @@
namespace impeller {
class Entity;
struct CanvasStackEntry {
Matrix transform;
// |cull_rect| is conservative screen-space bounds of the clipped output area

View File

@ -12,8 +12,6 @@
namespace impeller {
class EntityPass;
class PaintPassDelegate final : public EntityPassDelegate {
public:
explicit PaintPassDelegate(Paint paint);

View File

@ -14,7 +14,6 @@ namespace impeller {
class Context;
class DeviceBuffer;
class Texture;
//------------------------------------------------------------------------------
/// @brief An object that allocates device memory.

View File

@ -4,6 +4,9 @@
#pragma once
#include <unordered_map>
#include "impeller/base/comparable.h"
#include "impeller/core/sampler_descriptor.h"
namespace impeller {
@ -27,4 +30,9 @@ class Sampler {
Sampler& operator=(const Sampler&) = delete;
};
using SamplerMap = std::unordered_map<SamplerDescriptor,
std::shared_ptr<const Sampler>,
ComparableHash<SamplerDescriptor>,
ComparableEqual<SamplerDescriptor>>;
} // namespace impeller

View File

@ -4,14 +4,11 @@
#pragma once
#include <unordered_map>
#include "impeller/base/comparable.h"
#include "impeller/core/formats.h"
namespace impeller {
class Sampler;
class Context;
struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
@ -49,9 +46,4 @@ struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
}
};
using SamplerMap = std::unordered_map<SamplerDescriptor,
std::shared_ptr<const Sampler>,
ComparableHash<SamplerDescriptor>,
ComparableEqual<SamplerDescriptor>>;
} // namespace impeller

View File

@ -8,6 +8,7 @@
#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"
@ -20,7 +21,6 @@ class ShaderLibrary;
class SamplerLibrary;
class CommandBuffer;
class PipelineLibrary;
class Allocator;
//------------------------------------------------------------------------------
/// @brief To do anything rendering related with Impeller, you need a

View File

@ -4,9 +4,7 @@
#pragma once
#include <unordered_map>
#include "flutter/fml/macros.h"
#include "impeller/core/sampler.h"
#include "impeller/core/sampler_descriptor.h"
namespace impeller {