Move impeller::Comparable to //impeller/base. (flutter#62)

Just some minor cleanup. Fixes flutter#98686.
egramond · Apr 27, 2022 · 841bb99 · 841bb99
1 parent 24d7083
commit 841bb99
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git a/impeller/base/BUILD.gn b/impeller/base/BUILD.gn
@@ -10,6 +10,8 @@ impeller_component("base") {
     "allocation.h",
     "backend_cast.h",
     "base.h",
+    "comparable.cc",
+    "comparable.h",
     "config.h",
     "promise.cc",
     "promise.h",

diff --git a/impeller/renderer/comparable.cc → impeller/base/comparable.cc b/impeller/renderer/comparable.cc → impeller/base/comparable.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/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 
 namespace impeller {
 

diff --git a/impeller/renderer/comparable.h → impeller/base/comparable.h b/impeller/renderer/comparable.h → impeller/base/comparable.h
diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn
@@ -49,8 +49,6 @@ impeller_component("renderer") {
               "command.cc",
               "command_buffer.h",
               "command_buffer.cc",
-              "comparable.cc",
-              "comparable.h",
               "context.h",
               "context.cc",
               "device_buffer.h",

diff --git 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/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/renderer/sampler_descriptor.h"
 #include "impeller/renderer/sampler_library.h"
 

diff --git a/impeller/renderer/backend/metal/shader_library_mtl.h b/impeller/renderer/backend/metal/shader_library_mtl.h
@@ -12,7 +12,7 @@
 #include <unordered_map>
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/renderer/shader_library.h"
 
 namespace impeller {

diff --git a/impeller/renderer/pipeline_descriptor.h b/impeller/renderer/pipeline_descriptor.h
@@ -13,7 +13,7 @@
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/renderer/formats.h"
 #include "impeller/renderer/shader_types.h"
 

diff --git a/impeller/renderer/sampler_descriptor.h b/impeller/renderer/sampler_descriptor.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/renderer/formats.h"
 
 namespace impeller {

diff --git a/impeller/renderer/shader_function.h b/impeller/renderer/shader_function.h
@@ -6,7 +6,7 @@
 
 #include "flutter/fml/hash_combine.h"
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/renderer/shader_types.h"
 
 namespace impeller {

diff --git a/impeller/renderer/vertex_descriptor.h b/impeller/renderer/vertex_descriptor.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/renderer/shader_types.h"
 
 namespace impeller {

diff --git a/impeller/typographer/font.h b/impeller/typographer/font.h
@@ -8,7 +8,7 @@
 #include <optional>
 
 #include "flutter/fml/macros.h"
-#include "impeller/renderer/comparable.h"
+#include "impeller/base/comparable.h"
 #include "impeller/typographer/glyph.h"
 #include "impeller/typographer/typeface.h"
 

diff --git a/impeller/typographer/typeface.h b/impeller/typographer/typeface.h
@@ -5,8 +5,8 @@
 #pragma once
 
 #include "flutter/fml/macros.h"
+#include "impeller/base/comparable.h"
 #include "impeller/geometry/rect.h"
-#include "impeller/renderer/comparable.h"
 
 namespace impeller {