remove half.h and use luisa::half instead

LuisaGroup · Jun 2, 2024 · e0dbb60 · e0dbb60
1 parent 9cf1625
commit e0dbb60
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 112 deletions.
diff --git a/src/base/shape.h b/src/base/shape.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <runtime/rtx/mesh.h>
-#include <util/half.h>
 #include <util/vertex.h>
 #include <base/scene_node.h>
 #include <base/scene.h>

diff --git a/src/base/texture.h b/src/base/texture.h
@@ -7,7 +7,6 @@
 #include <dsl/syntax.h>
 #include <util/spec.h>
 #include <util/imageio.h>
-#include <util/half.h>
 #include <base/scene_node.h>
 #include <base/spectrum.h>
 

diff --git a/src/textures/image.cpp b/src/textures/image.cpp
@@ -4,10 +4,8 @@
 
 #include <util/thread_pool.h>
 #include <util/imageio.h>
-#include <util/half.h>
 #include <base/texture.h>
 #include <base/pipeline.h>
-#include <base/scene.h>
 
 namespace luisa::render {
 

diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -5,7 +5,6 @@ add_library(luisa-render-util SHARED
         xform.cpp xform.h
         spec.cpp spec.h
         colorspace.h
-        half.cpp half.h
         u64.cpp u64.h
         rng.cpp rng.h
         ies.cpp ies.h

diff --git a/src/util/half.cpp b/src/util/half.cpp
diff --git a/src/util/half.h b/src/util/half.h
diff --git a/src/util/imageio.cpp b/src/util/imageio.cpp
@@ -7,11 +7,9 @@
 #include <tinyexr.h>
 #include <stb/stb_image.h>
 #include <stb/stb_image_write.h>
-#include <stb/stb_image_resize2.h>
 
 #include <core/logging.h>
 #include <util/imageio.h>
-#include <util/half.h>
 
 namespace luisa::render {
 
@@ -236,16 +234,15 @@ LoadedImage LoadedImage::_load_half(const std::filesystem::path &path, LoadedIma
             "Failed to load HALF image '{}': {}.",
             filename, stbi_failure_reason());
     }
-    auto half_pixels = luisa::allocate_with_allocator<uint16_t>(w * h * expected_channels);
+    auto half_pixels = luisa::allocate_with_allocator<luisa::half>(w * h * expected_channels);
     for (auto i = 0u; i < w * h * expected_channels; i++) {
-        half_pixels[i] = float_to_half(
-            reinterpret_cast<const float *>(pixels)[i]);
+        half_pixels[i] = static_cast<luisa::half>(reinterpret_cast<const float *>(pixels)[i]);
     }
     stbi_image_free(pixels);
     return {
         half_pixels, storage, make_uint2(w, h),
         [](void *p) noexcept {
-            luisa::deallocate_with_allocator(static_cast<uint16_t *>(p));
+            luisa::deallocate_with_allocator(static_cast<luisa::half *>(p));
         }};
 }
 

diff --git a/src/util/imageio.h b/src/util/imageio.h
@@ -7,7 +7,6 @@
 #include <filesystem>
 
 #include <core/stl.h>
-#include <util/half.h>
 #include <runtime/rhi/pixel.h>
 
 namespace luisa::render {