diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index 85d168f36966f..b6c99713fd4a1 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -165,7 +165,6 @@ ../../../flutter/impeller/geometry/size_unittests.cc ../../../flutter/impeller/geometry/trig_unittests.cc ../../../flutter/impeller/golden_tests/README.md -../../../flutter/impeller/image/README.md ../../../flutter/impeller/playground ../../../flutter/impeller/renderer/backend/gles/test ../../../flutter/impeller/renderer/backend/metal/texture_mtl_unittests.mm diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 7779485846a59..e87ee01ef7089 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -5307,12 +5307,6 @@ ORIGIN: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.h + ../../.. ORIGIN: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.mm + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/golden_tests/working_directory.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/golden_tests/working_directory.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/image/compressed_image.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/image/compressed_image.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/image/decompressed_image.cc + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/image/decompressed_image.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/renderer/backend/gles/blit_command_gles.cc + ../../../flutter/LICENSE @@ -8147,12 +8141,6 @@ FILE: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.h FILE: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.mm FILE: ../../../flutter/impeller/golden_tests/working_directory.cc FILE: ../../../flutter/impeller/golden_tests/working_directory.h -FILE: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.cc -FILE: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.h -FILE: ../../../flutter/impeller/image/compressed_image.cc -FILE: ../../../flutter/impeller/image/compressed_image.h -FILE: ../../../flutter/impeller/image/decompressed_image.cc -FILE: ../../../flutter/impeller/image/decompressed_image.h FILE: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.cc FILE: ../../../flutter/impeller/renderer/backend/gles/allocator_gles.h FILE: ../../../flutter/impeller/renderer/backend/gles/blit_command_gles.cc diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn index 689935b16efc3..a504c6f5080ef 100644 --- a/impeller/BUILD.gn +++ b/impeller/BUILD.gn @@ -66,7 +66,6 @@ group("impeller") { "aiks", "display_list", "entity", - "image:image_skia_backend", "renderer", "renderer/backend", "typographer/backends/skia:typographer_skia_backend", @@ -99,7 +98,6 @@ impeller_component("impeller_unittests") { "entity:entity_unittests", "fixtures", "geometry:geometry_unittests", - "image:image_unittests", "playground", "renderer:renderer_unittests", "scene:scene_unittests", diff --git a/impeller/core/BUILD.gn b/impeller/core/BUILD.gn index 2f15c1b28788e..e4587bda12a83 100644 --- a/impeller/core/BUILD.gn +++ b/impeller/core/BUILD.gn @@ -45,7 +45,6 @@ impeller_component("core") { deps = [ "../base", "../geometry", - "../image", "//flutter/fml", ] } diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn index c69386e177fb2..a4a99d1fddaf2 100644 --- a/impeller/entity/BUILD.gn +++ b/impeller/entity/BUILD.gn @@ -233,7 +233,6 @@ impeller_component("entity") { ":entity_shaders", ":framebuffer_blend_entity_shaders", ":modern_entity_shaders", - "../image:image_skia_backend", "../renderer", "../typographer", ] diff --git a/impeller/playground/BUILD.gn b/impeller/playground/BUILD.gn index 60f2605fd4581..2449bc3017291 100644 --- a/impeller/playground/BUILD.gn +++ b/impeller/playground/BUILD.gn @@ -6,6 +6,8 @@ import("//flutter/impeller/tools/impeller.gni") import("//flutter/testing/testing.gni") impeller_component("playground") { + testonly = true + sources = [ "playground.cc", "playground.h", @@ -46,9 +48,9 @@ impeller_component("playground") { public_deps = [ "../fixtures:shader_fixtures", - "../image:image_skia_backend", "../renderer", "../scene/shaders", + "image:image_skia_backend", "imgui:imgui_impeller_backend", "//flutter/fml", "//flutter/third_party/glfw", diff --git a/impeller/image/BUILD.gn b/impeller/playground/image/BUILD.gn similarity index 78% rename from impeller/image/BUILD.gn rename to impeller/playground/image/BUILD.gn index f3dc73c662710..ed44158f9b2fd 100644 --- a/impeller/image/BUILD.gn +++ b/impeller/playground/image/BUILD.gn @@ -5,6 +5,7 @@ import("//flutter/impeller/tools/impeller.gni") impeller_component("image") { + testonly = true public = [ "compressed_image.h", "decompressed_image.h", @@ -16,22 +17,23 @@ impeller_component("image") { ] public_deps = [ - "../base", - "../geometry", + "../../base", + "../../geometry", ] deps = [ "//flutter/fml" ] } impeller_component("image_skia_backend") { + testonly = true public = [ "backends/skia/compressed_image_skia.h" ] sources = [ "backends/skia/compressed_image_skia.cc" ] public_deps = [ ":image", - "../base", - "../geometry", + "../../base", + "../../geometry", ] deps = [ @@ -39,12 +41,3 @@ impeller_component("image_skia_backend") { "//flutter/skia", ] } - -impeller_component("image_unittests") { - testonly = true - sources = [] - deps = [ - ":image_skia_backend", - "//flutter/testing", - ] -} diff --git a/impeller/image/README.md b/impeller/playground/image/README.md similarity index 100% rename from impeller/image/README.md rename to impeller/playground/image/README.md diff --git a/impeller/image/backends/skia/compressed_image_skia.cc b/impeller/playground/image/backends/skia/compressed_image_skia.cc similarity index 97% rename from impeller/image/backends/skia/compressed_image_skia.cc rename to impeller/playground/image/backends/skia/compressed_image_skia.cc index 66d917e4ab8b7..e44510cdfded9 100644 --- a/impeller/image/backends/skia/compressed_image_skia.cc +++ b/impeller/playground/image/backends/skia/compressed_image_skia.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/image/backends/skia/compressed_image_skia.h" +#include "impeller/playground/image/backends/skia/compressed_image_skia.h" #include diff --git a/impeller/image/backends/skia/compressed_image_skia.h b/impeller/playground/image/backends/skia/compressed_image_skia.h similarity index 71% rename from impeller/image/backends/skia/compressed_image_skia.h rename to impeller/playground/image/backends/skia/compressed_image_skia.h index 1db71c2bdb855..6c92b10264e3b 100644 --- a/impeller/image/backends/skia/compressed_image_skia.h +++ b/impeller/playground/image/backends/skia/compressed_image_skia.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FLUTTER_IMPELLER_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_ -#define FLUTTER_IMPELLER_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_ +#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_ +#define FLUTTER_IMPELLER_PLAYGROUND_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_ #include "flutter/fml/macros.h" -#include "impeller/image/compressed_image.h" +#include "impeller/playground/image/compressed_image.h" namespace impeller { @@ -30,4 +30,4 @@ class CompressedImageSkia final : public CompressedImage { } // namespace impeller -#endif // FLUTTER_IMPELLER_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_ +#endif // FLUTTER_IMPELLER_PLAYGROUND_IMAGE_BACKENDS_SKIA_COMPRESSED_IMAGE_SKIA_H_ diff --git a/impeller/image/compressed_image.cc b/impeller/playground/image/compressed_image.cc similarity index 89% rename from impeller/image/compressed_image.cc rename to impeller/playground/image/compressed_image.cc index 95f62b88bde76..5d1ad4e0fd7ae 100644 --- a/impeller/image/compressed_image.cc +++ b/impeller/playground/image/compressed_image.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/image/compressed_image.h" +#include "impeller/playground/image/compressed_image.h" namespace impeller { diff --git a/impeller/image/compressed_image.h b/impeller/playground/image/compressed_image.h similarity index 72% rename from impeller/image/compressed_image.h rename to impeller/playground/image/compressed_image.h index 69d69db81f928..5f6bf0089c05d 100644 --- a/impeller/image/compressed_image.h +++ b/impeller/playground/image/compressed_image.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FLUTTER_IMPELLER_IMAGE_COMPRESSED_IMAGE_H_ -#define FLUTTER_IMPELLER_IMAGE_COMPRESSED_IMAGE_H_ +#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMAGE_COMPRESSED_IMAGE_H_ +#define FLUTTER_IMPELLER_PLAYGROUND_IMAGE_COMPRESSED_IMAGE_H_ #include #include "flutter/fml/macros.h" #include "flutter/fml/mapping.h" #include "impeller/geometry/size.h" -#include "impeller/image/decompressed_image.h" +#include "impeller/playground/image/decompressed_image.h" namespace impeller { @@ -32,4 +32,4 @@ class CompressedImage { } // namespace impeller -#endif // FLUTTER_IMPELLER_IMAGE_COMPRESSED_IMAGE_H_ +#endif // FLUTTER_IMPELLER_PLAYGROUND_IMAGE_COMPRESSED_IMAGE_H_ diff --git a/impeller/image/decompressed_image.cc b/impeller/playground/image/decompressed_image.cc similarity index 98% rename from impeller/image/decompressed_image.cc rename to impeller/playground/image/decompressed_image.cc index 396aada36b9f4..70642ab492814 100644 --- a/impeller/image/decompressed_image.cc +++ b/impeller/playground/image/decompressed_image.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/image/decompressed_image.h" +#include "impeller/playground/image/decompressed_image.h" #include diff --git a/impeller/image/decompressed_image.h b/impeller/playground/image/decompressed_image.h similarity index 83% rename from impeller/image/decompressed_image.h rename to impeller/playground/image/decompressed_image.h index d6643b1a43119..300b9837bd0e9 100644 --- a/impeller/image/decompressed_image.h +++ b/impeller/playground/image/decompressed_image.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FLUTTER_IMPELLER_IMAGE_DECOMPRESSED_IMAGE_H_ -#define FLUTTER_IMPELLER_IMAGE_DECOMPRESSED_IMAGE_H_ +#ifndef FLUTTER_IMPELLER_PLAYGROUND_IMAGE_DECOMPRESSED_IMAGE_H_ +#define FLUTTER_IMPELLER_PLAYGROUND_IMAGE_DECOMPRESSED_IMAGE_H_ #include #include @@ -51,4 +51,4 @@ class DecompressedImage { } // namespace impeller -#endif // FLUTTER_IMPELLER_IMAGE_DECOMPRESSED_IMAGE_H_ +#endif // FLUTTER_IMPELLER_PLAYGROUND_IMAGE_DECOMPRESSED_IMAGE_H_ diff --git a/impeller/playground/playground.cc b/impeller/playground/playground.cc index 52ab0aaee66f4..be8fa71069075 100644 --- a/impeller/playground/playground.cc +++ b/impeller/playground/playground.cc @@ -8,8 +8,8 @@ #include #include "fml/time/time_point.h" -#include "impeller/image/backends/skia/compressed_image_skia.h" -#include "impeller/image/decompressed_image.h" +#include "impeller/playground/image/backends/skia/compressed_image_skia.h" +#include "impeller/playground/image/decompressed_image.h" #include "impeller/renderer/command_buffer.h" #include "impeller/runtime_stage/runtime_stage.h" @@ -20,8 +20,8 @@ #include "impeller/base/validation.h" #include "impeller/core/allocator.h" #include "impeller/core/formats.h" -#include "impeller/image/compressed_image.h" #include "impeller/playground/backend/vulkan/swiftshader_utilities.h" +#include "impeller/playground/image/compressed_image.h" #include "impeller/playground/imgui/imgui_impl_impeller.h" #include "impeller/playground/playground.h" #include "impeller/playground/playground_impl.h" diff --git a/impeller/playground/playground.h b/impeller/playground/playground.h index 6a08c623b2803..9c6cde6467d6a 100644 --- a/impeller/playground/playground.h +++ b/impeller/playground/playground.h @@ -15,8 +15,8 @@ #include "impeller/core/runtime_types.h" #include "impeller/core/texture.h" #include "impeller/geometry/point.h" -#include "impeller/image/compressed_image.h" -#include "impeller/image/decompressed_image.h" +#include "impeller/playground/image/compressed_image.h" +#include "impeller/playground/image/decompressed_image.h" #include "impeller/playground/switches.h" #include "impeller/renderer/render_pass.h" #include "impeller/renderer/renderer.h" diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn index 9fdc8964bc18f..2cf663bc4db1d 100644 --- a/impeller/renderer/BUILD.gn +++ b/impeller/renderer/BUILD.gn @@ -104,7 +104,6 @@ impeller_component("renderer") { "../base", "../core", "../geometry", - "../image", "../runtime_stage", "../tessellator", ] diff --git a/impeller/scene/node.cc b/impeller/scene/node.cc index 77c090f135301..aad7fc67199e7 100644 --- a/impeller/scene/node.cc +++ b/impeller/scene/node.cc @@ -14,7 +14,6 @@ #include "impeller/base/thread.h" #include "impeller/base/validation.h" #include "impeller/geometry/matrix.h" -#include "impeller/image/decompressed_image.h" #include "impeller/scene/animation/animation_player.h" #include "impeller/scene/importer/conversions.h" #include "impeller/scene/importer/scene_flatbuffers.h" @@ -80,17 +79,12 @@ static std::shared_ptr UnpackTextureFromFlatbuffer( return nullptr; } - DecompressedImage::Format format; switch (embedded->component_count()) { - case 1: - format = DecompressedImage::Format::kGrey; - break; - case 3: - format = DecompressedImage::Format::kRGB; - break; case 4: - format = DecompressedImage::Format::kRGBA; + // RGBA. break; + case 1: + case 3: default: FML_LOG(WARNING) << "Textures with " << embedded->component_count() << " components are not supported." << std::endl; @@ -106,15 +100,11 @@ static std::shared_ptr UnpackTextureFromFlatbuffer( auto image_mapping = std::make_shared( embedded->bytes()->Data(), embedded->bytes()->size()); - auto decompressed_image = - DecompressedImage(ISize(embedded->width(), embedded->height()), format, - image_mapping) - .ConvertToRGBA(); auto texture_descriptor = TextureDescriptor{}; texture_descriptor.storage_mode = StorageMode::kHostVisible; texture_descriptor.format = PixelFormat::kR8G8B8A8UNormInt; - texture_descriptor.size = decompressed_image.GetSize(); + texture_descriptor.size = ISize(embedded->width(), embedded->height()); // TODO(bdero): Generate mipmaps for embedded textures. texture_descriptor.mip_count = 1u; @@ -124,7 +114,7 @@ static std::shared_ptr UnpackTextureFromFlatbuffer( return nullptr; } - auto uploaded = texture->SetContents(decompressed_image.GetAllocation()); + auto uploaded = texture->SetContents(image_mapping); if (!uploaded) { FML_LOG(ERROR) << "Could not upload texture to device memory."; return nullptr; diff --git a/impeller/scene/scene_unittests.cc b/impeller/scene/scene_unittests.cc index 875e9fc1d9fb4..ff014b80ef448 100644 --- a/impeller/scene/scene_unittests.cc +++ b/impeller/scene/scene_unittests.cc @@ -14,7 +14,7 @@ #include "impeller/geometry/matrix.h" #include "impeller/geometry/quaternion.h" #include "impeller/geometry/vector.h" -#include "impeller/image/decompressed_image.h" +#include "impeller/playground/image/decompressed_image.h" #include "impeller/playground/playground.h" #include "impeller/playground/playground_test.h" #include "impeller/scene/animation/animation_clip.h"