diff --git a/impeller/base/BUILD.gn b/impeller/base/BUILD.gn index 489459bc5fc4d..19fc548aeff90 100644 --- 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 b/impeller/base/comparable.cc similarity index 87% rename from impeller/renderer/comparable.cc rename to impeller/base/comparable.cc index aac17598ac657..96463d6e719e1 100644 --- a/impeller/renderer/comparable.cc +++ b/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 b/impeller/base/comparable.h similarity index 100% rename from impeller/renderer/comparable.h rename to impeller/base/comparable.h diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn index 0520d394d387b..e719ebd89e3dd 100644 --- 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 index c8195320e8347..e4c3f99aaa8e3 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/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 index b09b4cda33a1b..ec9abbedebcf0 100644 --- a/impeller/renderer/backend/metal/shader_library_mtl.h +++ b/impeller/renderer/backend/metal/shader_library_mtl.h @@ -12,7 +12,7 @@ #include #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 index c26579b020a6f..cfe3d33a679dd 100644 --- 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 index bb2fffc61f120..1cdbd3e6f3a16 100644 --- 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 index 682a67e21ee23..273b280f068b2 100644 --- 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 index f0018c4566b97..4bef9b86d3644 100644 --- a/impeller/renderer/vertex_descriptor.h +++ b/impeller/renderer/vertex_descriptor.h @@ -7,7 +7,7 @@ #include #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 index 691b5d59483f0..e23d8908fa444 100644 --- a/impeller/typographer/font.h +++ b/impeller/typographer/font.h @@ -8,7 +8,7 @@ #include #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 index 5c2a8574ee84a..f3a4fe265af7f 100644 --- 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 {