Merge branch 'master' into spirv_intrinsics

Author: devshgraphicsprogramming

3rdparty/dxc/Readme.md

@@ -0,0 +1,89 @@
+# How to update the DXC module
+
+## FIRST TIME SETUP: Make sure you have the correct remotes!
+
+The following submodules as initialized on your system should have `origin` pointing at the `[email protected]:Devsh-Graphics-Programming` fork.
+
+Then a remote `Khronos` for the SPIR-V submodules, and `Microsoft` for the DXC.
+
+If they don't then you can correct that with `git remote add [RemoteName] [email protected]:[Organisation]/[Repo-Name].git` and `git remote remove [RemoteName]`
+
+## IF YOU GET `There is no tracking information for the current branch`
+
+just make the branch track the origin
+```
+git branch --set-upstream-to=origin/[BranchName] [BranchName]
+```
+
+## Its Basically an Depth First Search with a Prologue and Epilogue
+
+```
+checkout correct branch HEAD
+[optional] Merge latest stuff from original project
+recurse()
+commit
+push
+```
+
+### First make sure you're on some Nabla branch Head
+
+Just `git pull` and make sure you're tracking a branch.
+
+### Make sure DXC is tracked and pointing at HEAD
+
+```
+cd ./3rdparty/dxc/dxc
+git fetch
+git checkout devshFixes
+git pull
+```
+
+### SPIR-V Headers: track & get latest head, merge latest upstream, commit and push
+
+```
+cd ./external/SPIRV-Headers
+git fetch
+git checkout header_4_hlsl
+git pull
+git pull Khronos main
+git commit -m "latest Khronos `main` merge"
+git push
+```
+
+### SPIR-V Tools: track & get latest head, merge latest upstream, commit and push
+
+```
+cd ../SPIRV-Tools
+git fetch
+git checkout main
+git pull
+git pull Khronos main
+git commit -m "latest Khronos `main` merge"
+git push
+```
+
+### Back to DXC and commit the submodule pointer changes
+
+```
+cd ..
+git add .
+git commit -m "Update SPIR-V Headers and Tools"
+cd ..
+[optional] git pull Microsoft main
+[optional] git commit -m "merge upstream from Microsoft"
+git push
+```
+
+The reason the upstream from Microsoft is optional is because it might break our Clang hacks like:
+- abuse of `__decltype`
+- `inout` working like a reference, but only sometimes
+- abuse of reference type
+
+### Finally commit the change of DXC commit pointer to Nabla
+
+```
+cd ..
+git add dxc
+git commit -m "Updated DXC"
+git push
+```

3rdparty/dxc/dxc

@@ -1,6 +1,7 @@
 #ifndef _NBL_BUILTIN_HLSL_BIT_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BIT_INCLUDED_
 
+#include <nbl/builtin/hlsl/spirv_intrinsics/core.hlsl>
 #include <nbl/builtin/hlsl/cpp_compat.hlsl>
 
 #ifndef __HLSL_VERSION
@@ -12,6 +13,7 @@ namespace nbl::hlsl
 NBL_ALIAS_TEMPLATE_FUNCTION(std::rotl, rotl);
 NBL_ALIAS_TEMPLATE_FUNCTION(std::rotr, rotr);
 NBL_ALIAS_TEMPLATE_FUNCTION(std::countl_zero, countl_zero);
+NBL_ALIAS_TEMPLATE_FUNCTION(std::bit_cast, bit_cast);
 
 }
 #else
@@ -20,6 +22,13 @@ namespace nbl
 namespace hlsl
 {
 
+template<class T, class U>
+T bit_cast(U val)
+{
+    static_assert(sizeof(T) <= sizeof(U));
+    return spirv::bitcast<T, U>(val);
+}
+
 template<typename T, typename S>
 T rotl(T x, S s);
 template<typename T, typename S>
@@ -57,21 +66,29 @@ T rotr(T x, S s)
     }
 }
 
-template<typename T>
-uint16_t countl_zero(T n)
+namespace impl
 {
-    uint16_t result = 0u;
-    for(int32_t bits_log2=6; bits_log2>=0; bits_log2--)
-    {
-        const uint16_t shift = bits_log2 ? uint16_t(1)<<(bits_log2-1) : 0;
-        const uint64_t loMask = bits_log2 ? (1ull<<shift)-1 : 0;
-        const bool chooseHigh = n&(loMask<<shift);
-        n = uint16_t((chooseHigh ? (n>shift):n)&loMask);
+template<uint16_t bits>
+uint16_t clz(uint64_t N)
+{
+    static const uint64_t SHIFT   = bits>>1;
+    static const uint64_t LO_MASK = (1ull<<SHIFT)-1;
+    const bool CHOOSE_HIGH = N & (LO_MASK<<SHIFT);
+    const uint64_t NEXT = (CHOOSE_HIGH ? (N>>SHIFT):N)&LO_MASK;
+    const uint16_t value = uint16_t(clz<SHIFT>(NEXT) + (CHOOSE_HIGH ? 0:SHIFT));
+    return value;
+}
 
-        result += uint16_t(chooseHigh ? 0ull : shift);
-    }
 
-    return result;
+template<>
+uint16_t clz<1>(uint64_t N) { return uint16_t(1u-N&1); }
+
+}
+
+template<typename T>
+uint16_t countl_zero(T n)
+{
+    return impl::clz<sizeof(T)*8>(n);
 }
 
 }

examples_tests

@@ -1,12 +1,15 @@
 #ifndef _NBL_BUILTIN_HLSL_CPP_COMPAT_INCLUDED_
 #define _NBL_BUILTIN_HLSL_CPP_COMPAT_INCLUDED_
 
+#include <nbl/builtin/hlsl/macros.h>
 
 #ifndef __HLSL_VERSION
 #include <type_traits>
+#include <bit>
 
 #define ARROW ->
 #define NBL_CONSTEXPR constexpr
+#define NBL_CONSTEXPR_STATIC constexpr static
 #define NBL_CONSTEXPR_STATIC_INLINE constexpr static inline
 
 #define NBL_ALIAS_TEMPLATE_FUNCTION(origFunctionName, functionAlias) \
@@ -33,7 +36,6 @@ using add_pointer = std::add_pointer<T>;
 // it includes vector and matrix
 #include <nbl/builtin/hlsl/cpp_compat/intrinsics.h>
 
-
 #else
 
 #define ARROW .arrow().

include/nbl/builtin/hlsl/bit.hlsl

@@ -74,7 +74,7 @@ NBL_TYPEDEF_MATRICES_FOR_SCALAR(int64_t);
 NBL_TYPEDEF_MATRICES_FOR_SCALAR(uint16_t);
 NBL_TYPEDEF_MATRICES_FOR_SCALAR(uint32_t);
 NBL_TYPEDEF_MATRICES_FOR_SCALAR(uint64_t);
-// TODO: halfMxN with std::float16_t
+NBL_TYPEDEF_MATRICES_FOR_SCALAR(float16_t);
 NBL_TYPEDEF_MATRICES_FOR_SCALAR(float32_t);
 NBL_TYPEDEF_MATRICES_FOR_SCALAR(float64_t);
 

include/nbl/builtin/hlsl/cpp_compat.hlsl

@@ -7,6 +7,7 @@
 #include <glm/glm.hpp>
 #include <glm/detail/_swizzle.hpp>
 #include <stdint.h>
+#include <openexr/IlmBase/Half/half.h>
 
 namespace nbl::hlsl
 {
@@ -32,6 +33,12 @@ using uint32_t1 = vector<uint32_t, 1>;
 
 // TODO: halfN -> needs class implementation or C++23 std:float16_t
 
+using float16_t = half;
+using float16_t4 = vector<float16_t, 4>;
+using float16_t3 = vector<float16_t, 3>;
+using float16_t2 = vector<float16_t, 2>;
+using float16_t1 = vector<float16_t, 1>;
+
 using float32_t = float;
 using float32_t4 = vector<float32_t, 4>;
 using float32_t3 = vector<float32_t, 3>;