IGL: Remove platform specific ImageLoader for Mac, Win and iOS

Summary: This diff removes the platform specific ImageLoader implementations for Mac, Win and iOS. These all have the same implementation, so the functionality is just moved into the base class. Only Android still has a platform-specific implementation. Reviewed By: corporateshark Differential Revision: D49136971 fbshipit-source-id: c049121d6c5d363fb3e70d19ec746c9e41faccb3
facebook · Sep 16, 2023 · 7e7d49a · 7e7d49a
1 parent 00c8805
commit 7e7d49a
Show file tree

Hide file tree

Showing 20 changed files with 24 additions and 154 deletions.
diff --git a/shell/ios/CMakeLists.txt b/shell/ios/CMakeLists.txt
@@ -8,9 +8,9 @@ cmake_minimum_required(VERSION 3.16)
 set(PROJECT_NAME "iOS")
 
 file(GLOB PLATFORM_SHARED_SRC_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     ../shared/fileLoader/apple/*.mm ../shared/imageLoader/ios/*.mm ../shared/imageWriter/ios/*.mm ../shared/platform/ios/*.mm)
+     ../shared/fileLoader/apple/*.mm ../shared/imageWriter/ios/*.mm ../shared/platform/ios/*.mm)
 file(GLOB PLATFORM_SHARED_HEADER_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     ../shared/fileLoader/apple/*.h ../shared/imageLoader/ios/*.h ../shared/imageWriter/ios/*.h ../shared/platform/ios/*.h)
+     ../shared/fileLoader/apple/*.h ../shared/imageWriter/ios/*.h ../shared/platform/ios/*.h)
 
 add_library(IGLShellPlatform ${PLATFORM_SHARED_SRC_FILES} ${PLATFORM_SHARED_HEADER_FILES})
 target_link_libraries(IGLShellPlatform PUBLIC IGLLibrary)

diff --git a/shell/mac/CMakeLists.txt b/shell/mac/CMakeLists.txt
@@ -10,9 +10,9 @@ set(PROJECT_NAME "Mac")
 file(GLOB PLATFORM_SHARED_SRC_CPP_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      ../shared/imageWriter/stb/*.cpp ../shared/platform/mac/*.cpp)
 file(GLOB PLATFORM_SHARED_SRC_OBJC_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     ../shared/fileLoader/apple/*.mm ../shared/imageLoader/mac/*.mm ../shared/imageWriter/mac/*.mm)
+     ../shared/fileLoader/apple/*.mm ../shared/imageWriter/mac/*.mm)
 file(GLOB PLATFORM_SHARED_HEADER_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     ../shared/fileLoader/apple/*.h ../shared/imageLoader/mac/*.h ../shared/imageWriter/mac/*.h ../shared/imageWriter/stb/*.h
+     ../shared/fileLoader/apple/*.h ../shared/imageWriter/mac/*.h ../shared/imageWriter/stb/*.h
      ../shared/platform/mac/*.h)
 
 add_library(IGLShellPlatform ${PLATFORM_SHARED_SRC_CPP_FILES} ${PLATFORM_SHARED_SRC_OBJC_FILES} ${PLATFORM_SHARED_HEADER_FILES})

diff --git a/shell/mac/ViewController.mm b/shell/mac/ViewController.mm
@@ -24,7 +24,6 @@
 #import <igl/opengl/macos/Device.h>
 #import <igl/opengl/macos/HWDevice.h>
 #endif
-#include <shell/shared/imageLoader/mac/ImageLoaderMac.h>
 #include <shell/shared/platform/mac/PlatformMac.h>
 #include <shell/shared/renderSession/AppParams.h>
 #include <shell/shared/renderSession/DefaultSession.h>

diff --git a/shell/shared/imageLoader/ImageLoader.cpp b/shell/shared/imageLoader/ImageLoader.cpp
@@ -57,6 +57,12 @@ ImageLoader::ImageLoader(FileLoader& fileLoader) :
   fileLoader_(fileLoader),
   factory_(std::make_unique<iglu::textureloader::TextureLoaderFactory>(createLoaderFactories())) {}
 
+ImageData ImageLoader::defaultLoadImageData(const std::string& imageName) noexcept {
+  std::string fullName = fileLoader().fullPath(imageName);
+
+  return loadImageDataFromFile(fullName);
+}
+
 ImageData ImageLoader::loadImageDataFromFile(const std::string& fileName) noexcept {
   auto [data, length] = fileLoader_.loadBinaryData(fileName);
   if (IGL_VERIFY(data && length > 0)) {

diff --git a/shell/shared/imageLoader/ImageLoader.h b/shell/shared/imageLoader/ImageLoader.h
@@ -27,9 +27,10 @@ class ImageLoader {
  public:
   explicit ImageLoader(FileLoader& fileLoader);
   virtual ~ImageLoader() = default;
-  virtual ImageData loadImageData(std::string /*imageName*/) noexcept {
-    return checkerboard();
+  virtual ImageData loadImageData(const std::string& imageName) noexcept {
+    return defaultLoadImageData(imageName);
   }
+  static ImageData checkerboard() noexcept;
 
  protected:
   [[nodiscard]] const FileLoader& fileLoader() const noexcept {
@@ -45,7 +46,7 @@ class ImageLoader {
   [[nodiscard]] ImageData loadImageDataFromMemory(const uint8_t* data, uint32_t length) noexcept;
 
  private:
-  static ImageData checkerboard() noexcept;
+  ImageData defaultLoadImageData(const std::string& imageName) noexcept;
 
   FileLoader& fileLoader_;
   std::unique_ptr<iglu::textureloader::TextureLoaderFactory> factory_;

diff --git a/shell/shared/imageLoader/android/ImageLoaderAndroid.cpp b/shell/shared/imageLoader/android/ImageLoaderAndroid.cpp
@@ -14,7 +14,7 @@ namespace igl::shell {
 
 ImageLoaderAndroid::ImageLoaderAndroid(FileLoader& fileLoader) : ImageLoader(fileLoader) {}
 
-ImageData ImageLoaderAndroid::loadImageData(std::string imageName) noexcept {
+ImageData ImageLoaderAndroid::loadImageData(const std::string& imageName) noexcept {
   auto ret = ImageData();
 
   // Load file

diff --git a/shell/shared/imageLoader/android/ImageLoaderAndroid.h b/shell/shared/imageLoader/android/ImageLoaderAndroid.h
@@ -19,7 +19,7 @@ class ImageLoaderAndroid final : public ImageLoader {
  public:
   ImageLoaderAndroid(FileLoader& fileLoader);
   ~ImageLoaderAndroid() override = default;
-  ImageData loadImageData(std::string imageName) noexcept override;
+  ImageData loadImageData(const std::string& imageName) noexcept override;
   void setAssetManager(AAssetManager* mgr) {
     assetManager_ = mgr;
   }

diff --git a/shell/shared/imageLoader/ios/ImageLoaderIos.h b/shell/shared/imageLoader/ios/ImageLoaderIos.h
diff --git a/shell/shared/imageLoader/ios/ImageLoaderIos.mm b/shell/shared/imageLoader/ios/ImageLoaderIos.mm
diff --git a/shell/shared/imageLoader/mac/ImageLoaderMac.h b/shell/shared/imageLoader/mac/ImageLoaderMac.h
diff --git a/shell/shared/imageLoader/mac/ImageLoaderMac.mm b/shell/shared/imageLoader/mac/ImageLoaderMac.mm
diff --git a/shell/shared/imageLoader/win/ImageLoaderWin.cpp b/shell/shared/imageLoader/win/ImageLoaderWin.cpp
diff --git a/shell/shared/imageLoader/win/ImageLoaderWin.h b/shell/shared/imageLoader/win/ImageLoaderWin.h
diff --git a/shell/shared/platform/ios/PlatformIos.mm b/shell/shared/platform/ios/PlatformIos.mm
@@ -8,14 +8,14 @@
 #include <shell/shared/platform/ios/PlatformIos.h>
 
 #include <shell/shared/fileLoader/apple/FileLoaderApple.h>
-#include <shell/shared/imageLoader/ios/ImageLoaderIos.h>
+#include <shell/shared/imageLoader/ImageLoader.h>
 #include <shell/shared/imageWriter/ios/ImageWriterIos.h>
 
 namespace igl::shell {
 
 PlatformIos::PlatformIos(std::unique_ptr<igl::IDevice> device) : device_(std::move(device)) {
   fileLoader_ = std::make_unique<igl::shell::FileLoaderApple>();
-  imageLoader_ = std::make_unique<igl::shell::ImageLoaderIos>(*fileLoader_);
+  imageLoader_ = std::make_unique<igl::shell::ImageLoader>(*fileLoader_);
   imageWriter_ = std::make_unique<igl::shell::ImageWriterIos>();
 }
 

diff --git a/shell/shared/platform/mac/PlatformMac.cpp b/shell/shared/platform/mac/PlatformMac.cpp
@@ -8,14 +8,14 @@
 #include <shell/shared/platform/mac/PlatformMac.h>
 
 #include <shell/shared/fileLoader/apple/FileLoaderApple.h>
-#include <shell/shared/imageLoader/mac/ImageLoaderMac.h>
+#include <shell/shared/imageLoader/ImageLoader.h>
 #include <shell/shared/imageWriter/mac/ImageWriterMac.h>
 
 namespace igl::shell {
 
 PlatformMac::PlatformMac(std::shared_ptr<igl::IDevice> device) : device_(std::move(device)) {
   fileLoader_ = std::make_unique<igl::shell::FileLoaderApple>();
-  imageLoader_ = std::make_unique<igl::shell::ImageLoaderMac>(*fileLoader_);
+  imageLoader_ = std::make_unique<igl::shell::ImageLoader>(*fileLoader_);
   imageWriter_ = std::make_unique<igl::shell::ImageWriterMac>();
 }
 

diff --git a/shell/shared/platform/win/PlatformWin.cpp b/shell/shared/platform/win/PlatformWin.cpp
@@ -8,14 +8,14 @@
 #include <shell/shared/platform/win/PlatformWin.h>
 
 #include <shell/shared/fileLoader/win/FileLoaderWin.h>
-#include <shell/shared/imageLoader/win/ImageLoaderWin.h>
+#include <shell/shared/imageLoader/ImageLoader.h>
 #include <shell/shared/imageWriter/win/ImageWriterWin.h>
 
 namespace igl::shell {
 
 PlatformWin::PlatformWin(std::shared_ptr<igl::IDevice> device) : device_(std::move(device)) {
   fileLoader_ = std::make_unique<igl::shell::FileLoaderWin>();
-  imageLoader_ = std::make_unique<igl::shell::ImageLoaderWin>(*fileLoader_);
+  imageLoader_ = std::make_unique<igl::shell::ImageLoader>(*fileLoader_);
   imageWriter_ = std::make_unique<igl::shell::ImageWriterWin>();
 }
 

diff --git a/shell/windows/CMakeLists.txt b/shell/windows/CMakeLists.txt
@@ -11,10 +11,10 @@ add_definitions("-DNOMINMAX")
 add_definitions("-D_USE_MATH_DEFINES=1")
 
 file(GLOB PLATFORM_SHARED_SRC_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     ../shared/fileLoader/win/*.cpp ../shared/imageLoader/win/*.cpp ../shared/imageWriter/win/*.cpp
+     ../shared/fileLoader/win/*.cpp ../shared/imageWriter/win/*.cpp
      ../shared/imageWriter/stb/*.cpp ../shared/platform/win/*.cpp)
 file(GLOB PLATFORM_SHARED_HEADER_FILES LIST_DIRECTORIES false RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     ../shared/fileLoader/win/*.h ../shared/imageLoader/win/*.h ../shared/imageWriter/win/*.h ../shared/imageWriter/stb/*.h
+     ../shared/fileLoader/win/*.h ../shared/imageWriter/win/*.h ../shared/imageWriter/stb/*.h
      ../shared/platform/win/*.h)
 
 add_library(IGLShellPlatform ${PLATFORM_SHARED_SRC_FILES} ${PLATFORM_SHARED_HEADER_FILES})

diff --git a/shell/windows/opengl/App.cpp b/shell/windows/opengl/App.cpp
@@ -31,7 +31,6 @@
 #include <igl/opengl/Version.h>
 #include <igl/opengl/ViewTextureTarget.h>
 #include <memory>
-#include <shell/shared/imageLoader/win/ImageLoaderWin.h>
 #include <shell/shared/platform/win/PlatformWin.h>
 #include <shell/shared/renderSession/AppParams.h>
 #include <shell/shared/renderSession/DefaultSession.h>

diff --git a/shell/windows/opengles/App.cpp b/shell/windows/opengles/App.cpp
@@ -25,7 +25,6 @@
 #include <igl/opengl/egl/Device.h>
 #include <igl/opengl/egl/PlatformDevice.h>
 #include <memory>
-#include <shell/shared/imageLoader/win/ImageLoaderWin.h>
 #include <shell/shared/platform/win/PlatformWin.h>
 #include <shell/shared/renderSession/AppParams.h>
 #include <shell/shared/renderSession/DefaultSession.h>

diff --git a/shell/windows/vulkan/App.cpp b/shell/windows/vulkan/App.cpp
@@ -19,7 +19,6 @@
 #include <igl/vulkan/HWDevice.h>
 #include <igl/vulkan/VulkanContext.h>
 #include <memory>
-#include <shell/shared/imageLoader/win/ImageLoaderWin.h>
 #include <shell/shared/platform/win/PlatformWin.h>
 #include <shell/shared/renderSession/AppParams.h>
 #include <shell/shared/renderSession/DefaultSession.h>