Skip to content

Commit 841bb99

Browse files
chinmaygardednfield
authored andcommitted
Move impeller::Comparable to //impeller/base. (flutter#62)
Just some minor cleanup. Fixes flutter#98686.
1 parent 24d7083 commit 841bb99

12 files changed

+11
-11
lines changed

impeller/base/BUILD.gn

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ impeller_component("base") {
1010
"allocation.h",
1111
"backend_cast.h",
1212
"base.h",
13+
"comparable.cc",
14+
"comparable.h",
1315
"config.h",
1416
"promise.cc",
1517
"promise.h",

impeller/renderer/comparable.cc renamed to impeller/base/comparable.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#include "impeller/renderer/comparable.h"
5+
#include "impeller/base/comparable.h"
66

77
namespace impeller {
88

File renamed without changes.

impeller/renderer/BUILD.gn

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ impeller_component("renderer") {
4949
"command.cc",
5050
"command_buffer.h",
5151
"command_buffer.cc",
52-
"comparable.cc",
53-
"comparable.h",
5452
"context.h",
5553
"context.cc",
5654
"device_buffer.h",

impeller/renderer/backend/metal/sampler_library_mtl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "flutter/fml/macros.h"
1313
#include "impeller/base/backend_cast.h"
14-
#include "impeller/renderer/comparable.h"
14+
#include "impeller/base/comparable.h"
1515
#include "impeller/renderer/sampler_descriptor.h"
1616
#include "impeller/renderer/sampler_library.h"
1717

impeller/renderer/backend/metal/shader_library_mtl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <unordered_map>
1313

1414
#include "flutter/fml/macros.h"
15-
#include "impeller/renderer/comparable.h"
15+
#include "impeller/base/comparable.h"
1616
#include "impeller/renderer/shader_library.h"
1717

1818
namespace impeller {

impeller/renderer/pipeline_descriptor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include "flutter/fml/hash_combine.h"
1515
#include "flutter/fml/macros.h"
16-
#include "impeller/renderer/comparable.h"
16+
#include "impeller/base/comparable.h"
1717
#include "impeller/renderer/formats.h"
1818
#include "impeller/renderer/shader_types.h"
1919

impeller/renderer/sampler_descriptor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#pragma once
66

77
#include "flutter/fml/macros.h"
8-
#include "impeller/renderer/comparable.h"
8+
#include "impeller/base/comparable.h"
99
#include "impeller/renderer/formats.h"
1010

1111
namespace impeller {

impeller/renderer/shader_function.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "flutter/fml/hash_combine.h"
88
#include "flutter/fml/macros.h"
9-
#include "impeller/renderer/comparable.h"
9+
#include "impeller/base/comparable.h"
1010
#include "impeller/renderer/shader_types.h"
1111

1212
namespace impeller {

impeller/renderer/vertex_descriptor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <vector>
88

99
#include "flutter/fml/macros.h"
10-
#include "impeller/renderer/comparable.h"
10+
#include "impeller/base/comparable.h"
1111
#include "impeller/renderer/shader_types.h"
1212

1313
namespace impeller {

impeller/typographer/font.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <optional>
99

1010
#include "flutter/fml/macros.h"
11-
#include "impeller/renderer/comparable.h"
11+
#include "impeller/base/comparable.h"
1212
#include "impeller/typographer/glyph.h"
1313
#include "impeller/typographer/typeface.h"
1414

impeller/typographer/typeface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#pragma once
66

77
#include "flutter/fml/macros.h"
8+
#include "impeller/base/comparable.h"
89
#include "impeller/geometry/rect.h"
9-
#include "impeller/renderer/comparable.h"
1010

1111
namespace impeller {
1212

0 commit comments

Comments
 (0)