Some refactoring

sergcpp · Mar 12, 2024 · bd7f0c7 · bd7f0c7
1 parent b1db0dc
commit bd7f0c7
Show file tree

Hide file tree

Showing 33 changed files with 276 additions and 393 deletions.
diff --git a/internal/CoreRef.cpp b/internal/CoreRef.cpp
diff --git a/internal/CoreRef.h b/internal/CoreRef.h
@@ -143,8 +143,6 @@ force_inline float construct_float(uint32_t m) {
 }
 
 force_inline float fract(const float v) {
-    // float _unused;
-    // return modff(v, &_unused);
     return v - floorf(v);
 }
 

diff --git a/internal/SmallVector.h b/internal/SmallVector.h
@@ -10,43 +10,9 @@
 #include <utility>
 
 #include "../Span.h"
+#include "simd/aligned_allocator.h"
 
 namespace Ray {
-#ifndef RAY_ALIGNED_MALLOC_DEFINED
-inline void *aligned_malloc(size_t size, size_t alignment) {
-    while (alignment < sizeof(void *)) {
-        alignment *= 2;
-    }
-    size_t space = size + (alignment - 1);
-
-    void *ptr = malloc(space + sizeof(void *));
-    void *original_ptr = ptr;
-
-    char *ptr_bytes = static_cast<char *>(ptr);
-    ptr_bytes += sizeof(void *);
-
-    auto off = static_cast<size_t>(reinterpret_cast<uintptr_t>(ptr_bytes) % alignment);
-    if (off) {
-        off = alignment - off;
-    }
-    ptr_bytes += off;
-
-    ptr = static_cast<void *>(ptr_bytes);
-    ptr_bytes -= sizeof(void *);
-
-    memcpy(ptr_bytes, &original_ptr, sizeof(void *));
-
-    return ptr;
-}
-
-inline void aligned_free(void *p) {
-    if (p) {
-        free(static_cast<void **>(p)[-1]);
-    }
-}
-#define RAY_ALIGNED_MALLOC_DEFINED
-#endif
-
 template <typename T, int AlignmentOfT = alignof(T)> class SmallVectorImpl {
     T *begin_, *end_;
     size_t capacity_;

diff --git a/internal/Vk/ContextVK.cpp b/internal/Vk/ContextVK.cpp
@@ -66,23 +66,11 @@ void Ray::Vk::Context::Destroy() {
         api_.vkFreeCommandBuffers(device_, command_pool_, 1, &setup_cmd_buf_);
         api_.vkFreeCommandBuffers(device_, command_pool_, MaxFramesInFlight, draw_cmd_bufs_);
 
-        // for (int i = 0; i < StageBufferCount; ++i) {
-        //     default_stage_bufs_.fences[i].ClientWaitSync();
-        //     default_stage_bufs_.fences[i] = {};
-        //     default_stage_bufs_.bufs[i] = {};
-        // }
-
         api_.vkDestroyCommandPool(device_, command_pool_, nullptr);
         api_.vkDestroyCommandPool(device_, temp_command_pool_, nullptr);
 
-        // for (size_t i = 0; i < api_ctx_->present_image_views.size(); ++i) {
-        //     vkDestroyImageView(api_ctx_->device, api_ctx_->present_image_views[i], nullptr);
-        // }
-
-        // vkDestroySwapchainKHR(device_, api_ctx_->swapchain, nullptr);
-
         api_.vkDestroyDevice(device_, nullptr);
-        // vkDestroySurfaceKHR(instance_, surface_, nullptr);
+
         if (debug_callback_) {
             api_.vkDestroyDebugReportCallbackEXT(instance_, debug_callback_, nullptr);
         }

diff --git a/internal/shaders/common.glsl b/internal/shaders/common.glsl
@@ -75,27 +75,15 @@ vec3 normalize_len(const vec3 v, out float len) {
 }
 
 vec3 safe_invert(vec3 v) {
-    vec3 inv_v = 1.0f / v;
-
-    if (v.x <= FLT_EPS && v.x >= 0) {
-        inv_v.x = FLT_MAX;
-    } else if (v.x >= -FLT_EPS && v.x < 0) {
-        inv_v.x = -FLT_MAX;
-    }
-
-    if (v.y <= FLT_EPS && v.y >= 0) {
-        inv_v.y = FLT_MAX;
-    } else if (v.y >= -FLT_EPS && v.y < 0) {
-        inv_v.y = -FLT_MAX;
-    }
-
-    if (v.z <= FLT_EPS && v.z >= 0) {
-        inv_v.z = FLT_MAX;
-    } else if (v.z >= -FLT_EPS && v.z < 0) {
-        inv_v.z = -FLT_MAX;
+    vec3 ret;
+    [[unroll]] for (int i = 0; i < 3; ++i) {
+        [[flatten]] if (abs(v[i]) > FLT_EPS) {
+            ret[i] = 1.0 / v[i];
+        } else {
+            ret[i] = (v[i] >= 0.0) ? FLT_MAX : -FLT_MAX;
+        }
     }
-
-    return inv_v;
+    return ret;
 }
 
 vec3 srgb_to_rgb(vec3 col) {

diff --git a/internal/shaders/output/debug_rt.comp.cso.inl b/internal/shaders/output/debug_rt.comp.cso.inl
diff --git a/internal/shaders/output/debug_rt.comp.spv.inl b/internal/shaders/output/debug_rt.comp.spv.inl
diff --git a/internal/shaders/output/intersect_area_lights.comp.cso.inl b/internal/shaders/output/intersect_area_lights.comp.cso.inl
diff --git a/internal/shaders/output/intersect_area_lights.comp.spv.inl b/internal/shaders/output/intersect_area_lights.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene.rgen.spv.inl b/internal/shaders/output/intersect_scene.rgen.spv.inl
diff --git a/internal/shaders/output/intersect_scene_hwrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_hwrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_hwrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_hwrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_hwrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_hwrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect.rgen.spv.inl b/internal/shaders/output/intersect_scene_indirect.rgen.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_hwrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_indirect_hwrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_hwrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_indirect_hwrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_swrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_indirect_swrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_swrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_indirect_swrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_swrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_indirect_swrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_indirect_swrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_indirect_swrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_shadow_hwrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_swrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_shadow_swrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_swrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_shadow_swrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_swrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_shadow_swrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_shadow_swrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_shadow_swrt_bindless.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_swrt_atlas.comp.cso.inl b/internal/shaders/output/intersect_scene_swrt_atlas.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_swrt_atlas.comp.spv.inl b/internal/shaders/output/intersect_scene_swrt_atlas.comp.spv.inl
diff --git a/internal/shaders/output/intersect_scene_swrt_bindless.comp.cso.inl b/internal/shaders/output/intersect_scene_swrt_bindless.comp.cso.inl
diff --git a/internal/shaders/output/intersect_scene_swrt_bindless.comp.spv.inl b/internal/shaders/output/intersect_scene_swrt_bindless.comp.spv.inl
diff --git a/internal/simd/aligned_allocator.h b/internal/simd/aligned_allocator.h
@@ -9,7 +9,6 @@
 #include <stdexcept>
 
 namespace Ray {
-#ifndef RAY_ALIGNED_MALLOC_DEFINED
 inline void *aligned_malloc(size_t size, size_t alignment) {
     while (alignment < sizeof(void *)) {
         alignment *= 2;
@@ -48,9 +47,6 @@ inline void aligned_free(void *p) {
     }
 }
 
-#define RAY_ALIGNED_MALLOC_DEFINED
-#endif
-
 template <typename T, size_t Alignment> class aligned_allocator {
   public:
     // The following will be the same for virtually all allocators.