Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla into vulkan_1_3

devshgraphicsprogramming · devshgraphicsprogramming · commit 751a3fff158e · 2024-02-21T13:32:44.000+01:00
diff --git a/3rdparty/dxc/dxc b/3rdparty/dxc/dxc
@@ -1 +1 @@
-Subproject commit 79bf3aa07d0e603aded9d93b23bf5930d75dd539
+Subproject commit ba09ba7aa28a9f5c11c4f7951431d2dc8428b107
diff --git a/include/nbl/builtin/hlsl/glsl_compat/core.hlsl b/include/nbl/builtin/hlsl/glsl_compat/core.hlsl
@@ -18,7 +18,7 @@ namespace glsl
 template<typename T>
 T atomicAdd(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicAnd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
+    return spirv::atomicAdd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicAnd(NBL_REF_ARG(T) ptr, T value)
diff --git a/include/nbl/builtin/hlsl/workgroup/arithmetic.hlsl b/include/nbl/builtin/hlsl/workgroup/arithmetic.hlsl
@@ -98,7 +98,7 @@ template<bool Exclusive, uint16_t ItemCount, class BallotAccessor, class Arithme
 uint16_t ballotScanBitCount(NBL_REF_ARG(BallotAccessor) ballotAccessor, NBL_REF_ARG(ArithmeticAccessor) arithmeticAccessor)
 {
     const uint16_t subgroupIndex = SubgroupContiguousIndex();
-    const uint16_t bitfieldIndex = impl::getDWORD(subgroupIndex);
+    const uint16_t bitfieldIndex = getDWORD(subgroupIndex);
     const uint32_t localBitfield = ballotAccessor.get(bitfieldIndex);
 
     static const uint16_t DWORDCount = impl::ballot_dword_count<ItemCount>::value;
@@ -111,7 +111,7 @@ uint16_t ballotScanBitCount(NBL_REF_ARG(BallotAccessor) ballotAccessor, NBL_REF_
         arithmeticAccessor.set(subgroupIndex,count);
     arithmeticAccessor.workgroupExecutionAndMemoryBarrier();
     count = arithmeticAccessor.get(bitfieldIndex);
-    return uint16_t(countbits(localBitfield&(Exclusive ? glsl::gl_SubgroupLtMask():glsl::gl_SubgroupLeMask())[0])+count);
+    return uint16_t(countbits(localBitfield&(Exclusive ? glsl::gl_SubgroupLtMask():glsl::gl_SubgroupLeMask())[getDWORD(glsl::gl_SubgroupInvocationID())])+count);
 }
 }
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(nsc)
+add_subdirectory(nsc)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace glsl`
`18`	`18`	`template<typename T>`
`19`	`19`	`T atomicAdd(NBL_REF_ARG(T) ptr, T value)`
`20`	`20`	`{`
`21`		`- return spirv::atomicAnd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);`
	`21`	`+ return spirv::atomicAdd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);`
`22`	`22`	`}`
`23`	`23`	`template<typename T>`
`24`	`24`	`T atomicAnd(NBL_REF_ARG(T) ptr, T value)`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ template<bool Exclusive, uint16_t ItemCount, class BallotAccessor, class Arithme`
`98`	`98`	`uint16_t ballotScanBitCount(NBL_REF_ARG(BallotAccessor) ballotAccessor, NBL_REF_ARG(ArithmeticAccessor) arithmeticAccessor)`
`99`	`99`	`{`
`100`	`100`	`const uint16_t subgroupIndex = SubgroupContiguousIndex();`
`101`		`- const uint16_t bitfieldIndex = impl::getDWORD(subgroupIndex);`
	`101`	`+ const uint16_t bitfieldIndex = getDWORD(subgroupIndex);`
`102`	`102`	`const uint32_t localBitfield = ballotAccessor.get(bitfieldIndex);`
`103`	`103`
`104`	`104`	`static const uint16_t DWORDCount = impl::ballot_dword_count<ItemCount>::value;`
`@@ -111,7 +111,7 @@ uint16_t ballotScanBitCount(NBL_REF_ARG(BallotAccessor) ballotAccessor, NBL_REF_`
`111`	`111`	`arithmeticAccessor.set(subgroupIndex,count);`
`112`	`112`	`arithmeticAccessor.workgroupExecutionAndMemoryBarrier();`
`113`	`113`	`count = arithmeticAccessor.get(bitfieldIndex);`
`114`		`- return uint16_t(countbits(localBitfield&(Exclusive ? glsl::gl_SubgroupLtMask():glsl::gl_SubgroupLeMask())[0])+count);`
	`114`	`+ return uint16_t(countbits(localBitfield&(Exclusive ? glsl::gl_SubgroupLtMask():glsl::gl_SubgroupLeMask())[getDWORD(glsl::gl_SubgroupInvocationID())])+count);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-add_subdirectory(nsc)`
	`1`	`+add_subdirectory(nsc)`