Skip to content

Commit 3e93395

Browse files
authored
Remove some trivial forward declares from Impeller (flutter#48635)
Towards flutter#133417 (comment) 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.
1 parent c115ccf commit 3e93395

8 files changed

Lines changed: 11 additions & 18 deletions

File tree

‎impeller/aiks/aiks_context.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
namespace impeller {
1616

1717
struct Picture;
18-
class RenderPass;
1918

2019
class AiksContext {
2120
public:

‎impeller/aiks/canvas.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "impeller/aiks/paint.h"
1616
#include "impeller/aiks/picture.h"
1717
#include "impeller/core/sampler_descriptor.h"
18+
#include "impeller/entity/entity.h"
1819
#include "impeller/entity/entity_pass.h"
1920
#include "impeller/entity/geometry/geometry.h"
2021
#include "impeller/entity/geometry/vertices_geometry.h"
@@ -26,8 +27,6 @@
2627

2728
namespace impeller {
2829

29-
class Entity;
30-
3130
struct CanvasStackEntry {
3231
Matrix transform;
3332
// |cull_rect| is conservative screen-space bounds of the clipped output area

‎impeller/aiks/paint_pass_delegate.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
namespace impeller {
1414

15-
class EntityPass;
16-
1715
class PaintPassDelegate final : public EntityPassDelegate {
1816
public:
1917
explicit PaintPassDelegate(Paint paint);

‎impeller/core/allocator.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ namespace impeller {
1414

1515
class Context;
1616
class DeviceBuffer;
17-
class Texture;
1817

1918
//------------------------------------------------------------------------------
2019
/// @brief An object that allocates device memory.

‎impeller/core/sampler.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
#pragma once
66

7+
#include <unordered_map>
8+
9+
#include "impeller/base/comparable.h"
710
#include "impeller/core/sampler_descriptor.h"
811

912
namespace impeller {
@@ -27,4 +30,9 @@ class Sampler {
2730
Sampler& operator=(const Sampler&) = delete;
2831
};
2932

33+
using SamplerMap = std::unordered_map<SamplerDescriptor,
34+
std::shared_ptr<const Sampler>,
35+
ComparableHash<SamplerDescriptor>,
36+
ComparableEqual<SamplerDescriptor>>;
37+
3038
} // namespace impeller

‎impeller/core/sampler_descriptor.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44

55
#pragma once
66

7-
#include <unordered_map>
8-
97
#include "impeller/base/comparable.h"
108
#include "impeller/core/formats.h"
119

1210
namespace impeller {
1311

14-
class Sampler;
1512
class Context;
1613

1714
struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
@@ -49,9 +46,4 @@ struct SamplerDescriptor final : public Comparable<SamplerDescriptor> {
4946
}
5047
};
5148

52-
using SamplerMap = std::unordered_map<SamplerDescriptor,
53-
std::shared_ptr<const Sampler>,
54-
ComparableHash<SamplerDescriptor>,
55-
ComparableEqual<SamplerDescriptor>>;
56-
5749
} // namespace impeller

‎impeller/renderer/context.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <string>
99

1010
#include "flutter/fml/macros.h"
11+
#include "impeller/core/allocator.h"
1112
#include "impeller/core/capture.h"
1213
#include "impeller/core/formats.h"
1314
#include "impeller/core/host_buffer.h"
@@ -20,7 +21,6 @@ class ShaderLibrary;
2021
class SamplerLibrary;
2122
class CommandBuffer;
2223
class PipelineLibrary;
23-
class Allocator;
2424

2525
//------------------------------------------------------------------------------
2626
/// @brief To do anything rendering related with Impeller, you need a

‎impeller/renderer/sampler_library.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
#pragma once
66

7-
#include <unordered_map>
8-
9-
#include "flutter/fml/macros.h"
7+
#include "impeller/core/sampler.h"
108
#include "impeller/core/sampler_descriptor.h"
119

1210
namespace impeller {

0 commit comments

Comments
 (0)