Switch to C++17

Author: sergcpp

CMakeLists.txt

@@ -15,7 +15,7 @@ OPTION(ENABLE_PIX "Enable PIX debug/capture API" OFF)
 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Asan;Tsan" CACHE STRING "" FORCE)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(MSVC)

internal/AtmosphereRef.cpp

@@ -591,7 +591,7 @@ std::pair<Ray::Ref::fvec4, Ray::Ref::fvec4> Ray::Ref::IntegrateScatteringMain(
                     inout_transmittance * light_transmittance * light_color;
     }
 
-    return std::make_pair(radiance, multiscat_as_1);
+    return std::pair{radiance, multiscat_as_1};
 }
 
 template std::pair<Ray::Ref::fvec4, Ray::Ref::fvec4> Ray::Ref::IntegrateScatteringMain<false>(

internal/AtmosphereRef.h

@@ -4,8 +4,7 @@
 
 #include "CoreRef.h"
 
-namespace Ray {
-namespace Ref {
+namespace Ray::Ref {
 fvec4 IntegrateOpticalDepth(const atmosphere_params_t &params, const fvec4 &ray_start, const fvec4 &ray_dir);
 
 template <bool UniformPhase = false>
@@ -34,5 +33,4 @@ void ShadeSkyPrimary(const pass_settings_t &ps, Span<const hit_data_t> inters, S
 void ShadeSkySecondary(const pass_settings_t &ps, float clamp_direct, Span<const hit_data_t> inters,
                        Span<const ray_data_t> rays, Span<const uint32_t> ray_indices, const scene_data_t &sc,
                        int iteration, int img_w, color_rgba_t *out_color);
-} // namespace Ref
-} // namespace Ray
+} // namespace Ray::Ref

internal/Convolution.h

@@ -5,8 +5,7 @@
 #pragma warning(push)
 #pragma warning(disable : 6294) // Ill-defined for-loop
 
-namespace Ray {
-namespace NS {
+namespace Ray::NS {
 void ClearBorders(const rect_t &rect, const int w, const int h, const bool downscaled, const int out_channels,
                   float output[]) {
     if (!downscaled) {
@@ -586,7 +585,6 @@ void ConvolutionConcat3x3(const float *restrict data1, const float *restrict dat
 
 #undef index1
 }
-} // namespace NS
-} // namespace Ray
+} // namespace Ray::NS
 
 #pragma warning(pop)

internal/Core.cpp

@@ -652,9 +652,8 @@ uint32_t Ray::PreprocessPrims_HLBVH(Span<const prim_t> prims, std::vector<bvh_no
     s.min_primitives_in_leaf = 1;
 
     // Build top level hierarchy using SAH
-    const uint32_t new_nodes_count =
+    [[maybe_unused]] const uint32_t new_nodes_count =
         PreprocessPrims_SAH({&top_prims[0], top_prims.size()}, {}, s, out_nodes, top_indices);
-    unused(new_nodes_count);
 
     auto bottom_nodes_start = uint32_t(out_nodes.size());
 

internal/Core.h

@@ -58,9 +58,6 @@ force_inline unsigned char _BitScanForward64(unsigned long *Index, unsigned __in
 
 #endif
 
-#define unused(x) ((void)x)
-#define countof(x) (sizeof(x) / sizeof(x[0]))
-
 #include "simd/aligned_allocator.h"
 
 #define pack_unorm_16(x) uint16_t(x * 65535.0f)

internal/CoreSIMD.h

@@ -4068,11 +4068,10 @@ bool Ray::NS::Traverse_BLAS_WithStack_ClosestHit(const float ro[3], const float
                 goto TRAVERSE;
             }
         } else {
-            const int tri_start = int(nodes[cur.index].child[0] & PRIM_INDEX_BITS),
-                      tri_end = int(tri_start + nodes[cur.index].child[1]);
+            [[maybe_unused]] const int tri_start = int(nodes[cur.index].child[0] & PRIM_INDEX_BITS),
+                                       tri_end = int(tri_start + nodes[cur.index].child[1]);
             assert((tri_start % 8) == 0);
             assert((tri_end - tri_start) <= 8);
-            unused(tri_end);
             res |=
                 IntersectTri<S>(ro, rd, mtris[tri_start / 8], tri_start, inter_prim_index, inter_t, inter_u, inter_v);
         }
@@ -4123,9 +4122,8 @@ Ray::NS::ivec<S> Ray::NS::Traverse_BLAS_WithStack_AnyHit(const fvec<S> ro[3], co
             } else {
                 const int tri_start = nodes[cur].prim_index & PRIM_INDEX_BITS,
                           tri_end = tri_start + nodes[cur].prim_count;
-                const bool hit_found =
+                [[maybe_unused]] const bool hit_found =
                     IntersectTris_AnyHit(ro, rd, st.queue[st.index].mask, tris, tri_start, tri_end, obj_index, inter);
-                unused(hit_found);
                 /*if (hit_found) {
                     const bool is_backfacing = inter.prim_index < 0;
                     const uint32_t prim_index = is_backfacing ? -inter.prim_index - 1 : inter.prim_index;
@@ -4226,11 +4224,10 @@ int Ray::NS::Traverse_BLAS_WithStack_AnyHit(const float ro[3], const float rd[3]
                 goto TRAVERSE;
             }
         } else {
-            const int tri_start = int(nodes[cur.index].child[0] & PRIM_INDEX_BITS),
-                      tri_end = int(tri_start + nodes[cur.index].child[1]);
+            [[maybe_unused]] const int tri_start = int(nodes[cur.index].child[0] & PRIM_INDEX_BITS),
+                                       tri_end = int(tri_start + nodes[cur.index].child[1]);
             assert((tri_start % 8) == 0);
             assert((tri_end - tri_start) <= 8);
-            unused(tri_end);
             const bool hit_found =
                 IntersectTri<S>(ro, rd, mtris[tri_start / 8], tri_start, inter_prim_index, inter_t, inter_u, inter_v);
             if (hit_found) {

internal/DenoiseRef.h

@@ -2,8 +2,7 @@
 
 #include "CoreRef.h"
 
-namespace Ray {
-namespace Ref {
+namespace Ray::Ref {
 template <int WINDOW_SIZE = 7, int NEIGHBORHOOD_SIZE = 3>
 void JointNLMFilter(const color_rgba_t input[], const rect_t &rect, int input_stride, float alpha, float damping,
                     const color_rgba_t variance[], const color_rgba_t feature0[], float feature0_weight,
@@ -33,5 +32,4 @@ void ConvolutionConcat3x3(const float data1[], const float data2[], const float
                           const float weights[], const float biases[], float output[], int output_stride,
                           aligned_vector<float, 64> &temp_data);
 void ClearBorders(const rect_t &rect, int w, int h, bool downscaled, int out_channels, float output[]);
-} // namespace Ref
-} // namespace Ray
+} // namespace Ray::Ref

internal/Dx/AccStructureDX.h

@@ -3,8 +3,7 @@
 #include "DescriptorPoolDX.h"
 #include "ResourceDX.h"
 
-namespace Ray {
-namespace Dx {
+namespace Ray::Dx {
 class Context;
 
 class AccStructure {
@@ -32,5 +31,4 @@ class AccStructure {
 
     eResState resource_state = eResState::Undefined;
 };
-} // namespace Dx
-} // namespace Ray
+} // namespace Ray::Dx

internal/Dx/BufferDX.cpp

@@ -15,8 +15,7 @@
 #include "../../Log.h"
 #include "ContextDX.h"
 
-namespace Ray {
-namespace Dx {
+namespace Ray::Dx {
 D3D12_HEAP_TYPE GetDxHeapType(const eBufType type) {
     if (type == eBufType::Upload) {
         return D3D12_HEAP_TYPE_UPLOAD;
@@ -36,8 +35,7 @@ eResState GetInitialDxResourceState(const eBufType type) {
     }
     return eResState::Undefined;
 }
-} // namespace Dx
-} // namespace Ray
+} // namespace Ray::Dx
 
 int Ray::Dx::Buffer::g_GenCounter = 0;