Move format conversion function inside the ktx texture loader

Summary: ^^ Reviewed By: rokuz, corporateshark Differential Revision: D63038310 fbshipit-source-id: 3f7f100a5b5d71d4bcb634d3f6b1ca6f349f4758
facebook · Sep 19, 2024 · e799f09 · e799f09
1 parent 4f6bb7e
commit e799f09
Show file tree

Hide file tree

Showing 22 changed files with 729 additions and 290 deletions.
diff --git a/IGLU/texture_loader/ktx2/TextureLoaderFactory.cpp b/IGLU/texture_loader/ktx2/TextureLoaderFactory.cpp
@@ -8,8 +8,8 @@
 #include <IGLU/texture_loader/ktx2/TextureLoaderFactory.h>
 
 #include <IGLU/texture_loader/ktx2/Header.h>
+#include <IGLU/texture_loader/util/VkTextureFormat.h>
 #include <igl/IGLSafeC.h>
-#include <igl/vulkan/util/TextureFormatInt.h>
 #include <ktx.h>
 #include <numeric>
 #include <vector>
@@ -48,9 +48,8 @@ bool TextureLoaderFactory::canCreateInternal(DataReader headerReader,
   // vkFormat = 0 means basis universal or some non-Vulkan format.
   // In either case, we need to process the DFD to understand whether we can really handle the
   // format or not.
-  if (header->vkFormat != 0 &&
-      igl::vulkan::util::intVkTextureFormatToTextureFormat(
-          static_cast<int32_t>(header->vkFormat)) == igl::TextureFormat::Invalid) {
+  if (header->vkFormat != 0 && util::vkTextureFormatToTextureFormat(static_cast<int32_t>(
+                                   header->vkFormat)) == igl::TextureFormat::Invalid) {
     igl::Result::setResult(
         outResult, igl::Result::Code::InvalidOperation, "Unrecognized texture format.");
     return false;
@@ -93,8 +92,8 @@ bool TextureLoaderFactory::validate(DataReader reader,
   }
 
   if (header->vkFormat != 0u) {
-    const auto format = igl::vulkan::util::intVkTextureFormatToTextureFormat(
-        static_cast<int32_t>(header->vkFormat));
+    const auto format =
+        util::vkTextureFormatToTextureFormat(static_cast<int32_t>(header->vkFormat));
     const auto properties = igl::TextureFormatProperties::fromTextureFormat(format);
 
     const uint32_t mipLevelAlignment =
@@ -178,8 +177,7 @@ bool TextureLoaderFactory::validate(DataReader reader,
 igl::TextureFormat TextureLoaderFactory::textureFormat(const ktxTexture* texture) const noexcept {
   if (texture->classId == ktxTexture2_c) {
     const auto* texture2 = reinterpret_cast<const ktxTexture2*>(texture);
-    return igl::vulkan::util::intVkTextureFormatToTextureFormat(
-        static_cast<int32_t>(texture2->vkFormat));
+    return util::vkTextureFormatToTextureFormat(static_cast<int32_t>(texture2->vkFormat));
   }
 
   return igl::TextureFormat::Invalid;

diff --git a/IGLU/texture_loader/util/VkTextureFormat.cpp b/IGLU/texture_loader/util/VkTextureFormat.cpp
diff --git a/src/igl/vulkan/util/TextureFormatInt.h → IGLU/texture_loader/util/VkTextureFormat.h b/src/igl/vulkan/util/TextureFormatInt.h → IGLU/texture_loader/util/VkTextureFormat.h
@@ -10,7 +10,6 @@
 #include <cstdint>
 #include <igl/TextureFormat.h>
 
-namespace igl::vulkan::util {
-
-TextureFormat intVkTextureFormatToTextureFormat(int32_t vkFormat);
-} // namespace igl::vulkan::util
+namespace iglu::textureloader::util {
+igl::TextureFormat vkTextureFormatToTextureFormat(int32_t vkFormat);
+} // namespace iglu::textureloader::util
diff --git a/samples/desktop/CMakeLists.txt b/samples/desktop/CMakeLists.txt
@@ -48,6 +48,3 @@ add_demo("Tiny_MeshLarge")
 
 target_sources(Tiny_MeshLarge
                PUBLIC "${IGL_ROOT_DIR}/third-party/deps/src/3D-Graphics-Rendering-Cookbook/shared/UtilsCubemap.cpp")
-if(NOT IGL_WITH_VULKAN)
-  target_sources(Tiny_MeshLarge PUBLIC "${IGL_ROOT_DIR}/src/igl/vulkan/util/TextureFormat.cpp")
-endif()
diff --git a/samples/desktop/Tiny/Tiny_MeshLarge.cpp b/samples/desktop/Tiny/Tiny_MeshLarge.cpp
@@ -29,7 +29,8 @@
 
 #include <igl/FPSCounter.h>
 #include <igl/IGL.h>
-#include <igl/vulkan/util/TextureFormatInt.h>
+
+#include <IGLU/texture_loader/util/VkTextureFormat.h>
 
 #include <glm/ext.hpp>
 #include <glm/glm.hpp>
@@ -2294,12 +2295,12 @@ void loadCubemapTexture(const std::string& fileNameKTX, std::shared_ptr<ITexture
     texRefRange.numMipLevels = TextureDesc::calcNumMipLevels(texRefRange.width, texRefRange.height);
   }
 
-  auto desc =
-      TextureDesc::newCube(igl::vulkan::util::intVkTextureFormatToTextureFormat(texture->vkFormat),
-                           texRefRange.width,
-                           texRefRange.height,
-                           TextureDesc::TextureUsageBits::Sampled,
-                           fileNameKTX.c_str());
+  auto desc = TextureDesc::newCube(
+      iglu::textureloader::util::vkTextureFormatToTextureFormat(texture->vkFormat),
+      texRefRange.width,
+      texRefRange.height,
+      TextureDesc::TextureUsageBits::Sampled,
+      fileNameKTX.c_str());
   desc.numMipLevels = texRefRange.numMipLevels;
   tex = device_->createTexture(desc, nullptr);
   IGL_ASSERT(tex);

diff --git a/shell/openxr/mobile/vulkan/XrSwapchainProviderImplVulkan.cpp b/shell/openxr/mobile/vulkan/XrSwapchainProviderImplVulkan.cpp
@@ -12,11 +12,11 @@
 #include <fmt/core.h>
 #include <igl/vulkan/Device.h>
 #include <igl/vulkan/Texture.h>
+#include <igl/vulkan/TextureFormat.h>
 #include <igl/vulkan/VulkanContext.h>
 #include <igl/vulkan/VulkanDevice.h>
 #include <igl/vulkan/VulkanImage.h>
 #include <igl/vulkan/VulkanImageView.h>
-#include <igl/vulkan/util/TextureFormat.h>
 
 #include <shell/openxr/XrLog.h>
 
@@ -98,7 +98,7 @@ std::shared_ptr<igl::ITexture> getSurfaceTexture(
   }
 
   const auto& actualDevice = static_cast<igl::vulkan::Device&>(device);
-  const auto iglFormat = vulkan::util::vkTextureFormatToTextureFormat(externalTextureFormat);
+  const auto iglFormat = vulkan::vkTextureFormatToTextureFormat(externalTextureFormat);
   const auto texture = inOutTextures[imageIndex];
   // allocate new drawable textures if its null or mismatches in size or format
   if (!texture || swapchainImageInfo.imageWidth != texture->getSize().width ||

diff --git a/src/igl/tests/iglu/texture_loader/Ktx2TextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/Ktx2TextureLoaderTest.cpp
@@ -9,8 +9,8 @@
 
 #include <IGLU/texture_loader/ktx2/Header.h>
 #include <IGLU/texture_loader/ktx2/TextureLoaderFactory.h>
+#include <IGLU/texture_loader/util/VkTextureFormat.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormatInt.h>
 #include <numeric>
 #include <vector>
 
@@ -59,8 +59,7 @@ uint32_t getTotalDataSize(uint32_t vkFormat,
                           uint32_t width,
                           uint32_t height,
                           uint32_t numMipLevels) {
-  const auto format =
-      igl::vulkan::util::intVkTextureFormatToTextureFormat(static_cast<int32_t>(vkFormat));
+  const auto format = iglu::textureloader::util::vkTextureFormatToTextureFormat(vkFormat);
   const auto properties = igl::TextureFormatProperties::fromTextureFormat(format);
 
   const auto range = igl::TextureRangeDesc::new2D(0, 0, std::max(width, 1u), std::max(height, 1u));
@@ -89,8 +88,7 @@ void putDfd(std::vector<uint8_t>& buffer, uint32_t vkFormat, uint32_t numMipLeve
   ASSERT_TRUE(vkFormat == VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG ||
               vkFormat == VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK);
 
-  const auto format =
-      igl::vulkan::util::intVkTextureFormatToTextureFormat(static_cast<int32_t>(vkFormat));
+  const auto format = iglu::textureloader::util::vkTextureFormatToTextureFormat(vkFormat);
   const auto properties = igl::TextureFormatProperties::fromTextureFormat(format);
 
   const uint16_t descriptorType = 0;
@@ -154,8 +152,7 @@ void putDfd(std::vector<uint8_t>& buffer, uint32_t vkFormat, uint32_t numMipLeve
 
 void putMipLevel(std::vector<uint8_t>& buffer, uint32_t mipLevel, uint32_t imageSize) {
   const auto* header = reinterpret_cast<const iglu::textureloader::ktx2::Header*>(buffer.data());
-  const auto format =
-      igl::vulkan::util::intVkTextureFormatToTextureFormat(static_cast<int32_t>(header->vkFormat));
+  const auto format = iglu::textureloader::util::vkTextureFormatToTextureFormat(header->vkFormat);
   const auto properties = igl::TextureFormatProperties::fromTextureFormat(format);
 
   const auto range = igl::TextureRangeDesc::new2D(

diff --git a/src/igl/tests/iglu/texture_loader/StbHdrTextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/StbHdrTextureLoaderTest.cpp
@@ -10,7 +10,7 @@
 #include <IGLU/texture_loader/stb_hdr/Header.h>
 #include <IGLU/texture_loader/stb_hdr/TextureLoaderFactory.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormat.h>
+#include <igl/vulkan/TextureFormat.h>
 #include <numeric>
 #include <vector>
 

diff --git a/src/igl/tests/iglu/texture_loader/StbJpegTextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/StbJpegTextureLoaderTest.cpp
@@ -10,7 +10,7 @@
 #include <IGLU/texture_loader/stb_jpeg/Header.h>
 #include <IGLU/texture_loader/stb_jpeg/TextureLoaderFactory.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormat.h>
+#include <igl/vulkan/TextureFormat.h>
 #include <numeric>
 #include <vector>
 

diff --git a/src/igl/tests/iglu/texture_loader/StbPngTextureLoaderTest.cpp b/src/igl/tests/iglu/texture_loader/StbPngTextureLoaderTest.cpp
@@ -10,7 +10,7 @@
 #include <IGLU/texture_loader/stb_png/Header.h>
 #include <IGLU/texture_loader/stb_png/TextureLoaderFactory.h>
 #include <cstring>
-#include <igl/vulkan/util/TextureFormat.h>
+#include <igl/vulkan/TextureFormat.h>
 #include <numeric>
 #include <vector>