Resolved conflicts, merged master

Author: Przemog1

examples_tests

@@ -33,6 +33,8 @@ namespace nbl::asset
 
 #ifdef _NBL_PLATFORM_WINDOWS_
 				return m_HLSLCompiler;
+#else
+				return nullptr;
 #endif
 			}
 			else if (contentType == IShader::E_CONTENT_TYPE::ECT_GLSL)

include/nbl/asset/utils/CCompilerSet.h

@@ -11,6 +11,84 @@ namespace nbl
 namespace hlsl
 {
 
+namespace impl
+{
+#ifdef __HLSL_VERSION
+
+    // TODO: use structs
+
+    template<typename T>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(T) lhs, NBL_REF_ARG(T) rhs)
+    {
+        T tmp = lhs;
+        lhs = rhs;
+        rhs = tmp;
+    }
+
+    template<>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(uint16_t) lhs, NBL_REF_ARG(uint16_t) rhs)
+    {
+        lhs ^= rhs;
+        rhs ^= lhs;
+        lhs ^= rhs;
+    }
+
+    template<>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(uint32_t) lhs, NBL_REF_ARG(uint32_t) rhs)
+    {
+        lhs ^= rhs;
+        rhs ^= lhs;
+        lhs ^= rhs;
+    }
+
+    template<>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(uint64_t) lhs, NBL_REF_ARG(uint64_t) rhs)
+    {
+        lhs ^= rhs;
+        rhs ^= lhs;
+        lhs ^= rhs;
+    }
+
+    template<>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(int16_t) lhs, NBL_REF_ARG(int16_t) rhs)
+    {
+        lhs ^= rhs;
+        rhs ^= lhs;
+        lhs ^= rhs;
+    }
+
+    template<>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(int32_t) lhs, NBL_REF_ARG(int32_t) rhs)
+    {
+        lhs ^= rhs;
+        rhs ^= lhs;
+        lhs ^= rhs;
+    }
+
+    template<>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(int64_t) lhs, NBL_REF_ARG(int64_t) rhs)
+    {
+        lhs ^= rhs;
+        rhs ^= lhs;
+        lhs ^= rhs;
+    }
+#else
+    template<typename T>
+    NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(T) lhs, NBL_REF_ARG(T) rhs)
+    {
+        std::swap(lhs, rhs);
+    }
+#endif
+}
+
+template<typename T>
+NBL_CONSTEXPR_INLINE_FUNC void swap(NBL_REF_ARG(T) lhs, NBL_REF_ARG(T) rhs)
+{
+    impl::swap<T>(lhs, rhs);
+}
+
+
+#ifdef __HLSL_VERSION
 
 namespace impl
 {
@@ -146,6 +224,7 @@ uint upper_bound(inout Accessor accessor, const uint begin, const uint end, cons
     return impl::upper_bound<Accessor,typename Accessor::value_type>(accessor,begin,end,value);
 }
 
+#endif
 }
 }
 

include/nbl/builtin/hlsl/algorithm.hlsl

@@ -7,6 +7,7 @@
 #include <nbl/builtin/hlsl/array_accessors.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat/impl/intrinsics_impl.hlsl>
 #include <nbl/builtin/hlsl/matrix_utils/matrix_traits.hlsl>
+#include <nbl/builtin/hlsl/ieee754.hlsl>
 
 #ifndef __HLSL_VERSION
 #include <algorithm>