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

Author: devshgraphicsprogramming

include/nbl/builtin/hlsl/glsl_compat/core.hlsl

@@ -18,42 +18,42 @@ namespace glsl
 template<typename T>
 T atomicAdd(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicAdd<T>(ptr, 1, 0, value);
+    return spirv::atomicAnd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicAnd(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicAnd<T>(ptr, 1, 0, value);
+    return spirv::atomicAnd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicOr(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicOr<T>(ptr, 1, 0, value);
+    return spirv::atomicOr<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicXor(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicXor<T>(ptr, 1, 0, value);
+    return spirv::atomicXor<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicMin(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicMin<T>(ptr, 1, 0, value);
+    return spirv::atomicMin<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicMax(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicMax<T>(ptr, 1, 0, value);
+    return spirv::atomicMax<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicExchange(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicExchange<T>(ptr, 1, 0, value);
+    return spirv::atomicExchange<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicCompSwap(NBL_REF_ARG(T) ptr, T comparator, T value)
 {
-    return spirv::atomicCompSwap<T>(ptr, 1, 0, 0, value, comparator);
+    return spirv::atomicCompSwap<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, spv::DecorationRelaxedPrecision, value, comparator);
 }
 
 /**

include/nbl/builtin/hlsl/glsl_compat/subgroup_arithmetic.hlsl

@@ -28,80 +28,80 @@ T subgroupExclusiveAdd(T value) {
 
 template<typename T>
 T subgroupMul(T value) {
-    return spirv::groupMul(3, 0, value);
+    return spirv::groupMul(spv::ScopeSubgroup, spv::GroupOperationReduce, value);
 }
 template<typename T>
 T subgroupInclusiveMul(T value) {
-    return spirv::groupMul(3, 1, value);
+    return spirv::groupMul(spv::ScopeSubgroup, spv::GroupOperationInclusiveScan, value);
 }
 template<typename T>
 T subgroupExclusiveMul(T value) {
-    return spirv::groupMul(3, 2, value);
+    return spirv::groupMul(spv::ScopeSubgroup, spv::GroupOperationExclusiveScan, value);
 }
 
 template<typename T>
 T subgroupAnd(T value) {
-    return spirv::groupBitwiseAnd(3, 0, value);
+    return spirv::groupBitwiseAnd(spv::ScopeSubgroup, spv::GroupOperationReduce, value);
 }
 template<typename T>
 T subgroupInclusiveAnd(T value) {
-    return spirv::groupBitwiseAnd(3, 1, value);
+    return spirv::groupBitwiseAnd(spv::ScopeSubgroup, spv::GroupOperationInclusiveScan, value);
 }
 template<typename T>
 T subgroupExclusiveAnd(T value) {
-    return spirv::groupBitwiseAnd(3, 2, value);
+    return spirv::groupBitwiseAnd(spv::ScopeSubgroup, spv::GroupOperationExclusiveScan, value);
 }
 
 template<typename T>
 T subgroupOr(T value) {
-    return spirv::groupBitwiseOr(3, 0, value);
+    return spirv::groupBitwiseOr(spv::ScopeSubgroup, spv::GroupOperationReduce, value);
 }
 template<typename T>
 T subgroupInclusiveOr(T value) {
-    return spirv::groupBitwiseOr(3, 1, value);
+    return spirv::groupBitwiseOr(spv::ScopeSubgroup, spv::GroupOperationInclusiveScan, value);
 }
 template<typename T>
 T subgroupExclusiveOr(T value) {
-    return spirv::groupBitwiseOr(3, 2, value);
+    return spirv::groupBitwiseOr(spv::ScopeSubgroup, spv::GroupOperationExclusiveScan, value);
 }
 
 template<typename T>
 T subgroupXor(T value) {
-    return spirv::groupBitwiseXor(3, 0, value);
+    return spirv::groupBitwiseXor(spv::ScopeSubgroup, spv::GroupOperationReduce, value);
 }
 template<typename T>
 T subgroupInclusiveXor(T value) {
-    return spirv::groupBitwiseXor(3, 1, value);
+    return spirv::groupBitwiseXor(spv::ScopeSubgroup, spv::GroupOperationInclusiveScan, value);
 }
 template<typename T>
 T subgroupExclusiveXor(T value) {
-    return spirv::groupBitwiseXor(3, 2, value);
+    return spirv::groupBitwiseXor(spv::ScopeSubgroup, spv::GroupOperationExclusiveScan, value);
 }
 
 template<typename T>
 T subgroupMin(T value) {
-    return spirv::groupBitwiseMin(3, 0, value);
+    return spirv::groupBitwiseMin(spv::ScopeSubgroup, spv::GroupOperationReduce, value);
 }
 template<typename T>
 T subgroupInclusiveMin(T value) {
-    return spirv::groupBitwiseMin(3, 1, value);
+    return spirv::groupBitwiseMin(spv::ScopeSubgroup, spv::GroupOperationInclusiveScan, value);
 }
 template<typename T>
 T subgroupExclusiveMin(T value) {
-    return spirv::groupBitwiseMin(3, 2, value);
+    return spirv::groupBitwiseMin(spv::ScopeSubgroup, spv::GroupOperationExclusiveScan, value);
 }
 
 template<typename T>
 T subgroupMax(T value) {
-    return spirv::groupBitwiseMax(3, 0, value);
+    return spirv::groupBitwiseMax(spv::ScopeSubgroup, spv::GroupOperationReduce, value);
 }
 template<typename T>
 T subgroupInclusiveMax(T value) {
-    return spirv::groupBitwiseMax(3, 1, value);
+    return spirv::groupBitwiseMax(spv::ScopeSubgroup, spv::GroupOperationInclusiveScan, value);
 }
 template<typename T>
 T subgroupExclusiveMax(T value) {
-    return spirv::groupBitwiseMax(3, 2, value);
+    return spirv::groupBitwiseMax(spv::ScopeSubgroup, spv::GroupOperationExclusiveScan, value);
 }
 
 }