Partial implementation of scan methods and subgroup primitives

Author: kpentaris

include/nbl/builtin/hlsl/binops.hlsl

@@ -37,6 +37,15 @@ struct bitwise_xor
     }
 };
 
+template<typename T>
+struct bitwise_add
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        return lhs+rhs;
+    }
+};
+
 template<typename T>
 struct bitwise_mul
 {
@@ -61,7 +70,7 @@ struct bitwise_min
     T operator()(const T lhs, const T rhs)
     {
 		comparator_lt_t comp;
-        return min(lhs, rhs, comp);
+        return bitwise_min(lhs, rhs, comp);
     }
 };
 
@@ -80,7 +89,7 @@ struct bitwise_max
     T operator()(const T lhs, const T rhs)
     {
 		comparator_gt_t comp;
-        return max(lhs, rhs, comp);
+        return bitwise_max(lhs, rhs, comp);
     }
 };
 

include/nbl/builtin/hlsl/subgroup/arithmetic_portability.hlsl

@@ -0,0 +1,95 @@
+#ifndef _NBL_BUILTIN_HLSL_SUBGROUP_ARITHMETIC_PORTABILITY_INCLUDED_
+#define _NBL_BUILTIN_HLSL_SUBGROUP_ARITHMETIC_PORTABILITY_INCLUDED_
+
+#ifndef NBL_GL_KHR_shader_subgroup_arithmetic
+#include <nbl/builtin/hlsl/subgroup/basic_portability.hlsl>
+#endif
+
+static uint4 WHOLE_WAVE = ~0;
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace subgroup
+{
+
+#ifdef NBL_GL_KHR_shader_subgroup_arithmetic
+namespace native
+{
+
+template<class Binop>
+struct reduction;
+template<class Binop>
+struct exclusive_scan;
+template<class Binop>
+struct inclusive_scan;
+
+}
+#endif
+
+template<class Binop>
+struct reduction
+{
+    template<class ScratchAccessor, typename T>
+    T operator()(const T x)
+    {
+    #ifdef NBL_GL_KHR_shader_subgroup_arithmetic
+        return native::reduction<Binop>()(x);
+    #else
+        portability::reduction<Binop,ScratchAccessor> impl;
+        return impl(x);
+    #endif
+    }
+};
+
+template<class Binop>
+struct exclusive_scan
+{
+    template<class ScratchAccessor, typename T>
+    T operator()(const T x)
+    {
+    #ifdef NBL_GL_KHR_shader_subgroup_arithmetic
+        return native::exclusive_scan<Binop>()(x);
+    #else
+        portability::exclusive_scan<Binop,ScratchAccessor> impl;
+        return impl(x);
+    #endif
+    }
+};
+
+template<class Binop>
+struct inclusive_scan
+{
+    template<class ScratchAccessor, typename T>
+    T operator()(const T x)
+    {
+    #ifdef NBL_GL_KHR_shader_subgroup_arithmetic
+        return native::inclusive_scan<Binop>()(x);
+    #else
+        portability::inclusive_scan<Binop,ScratchAccessor> impl;
+        return impl(x);
+    #endif
+    }
+};
+
+namespace portability
+{
+
+// PORTABILITY BINOP DECLARATIONS
+template<class Binop, class ScratchAccessor>
+struct reduction;
+template<class Binop, class ScratchAccessor>
+struct inclusive_scan;
+template<class Binop, class ScratchAccessor>
+struct exclusive_scan;
+
+}
+
+}
+}
+}
+
+#include <nbl/builtin/hlsl/subgroup/arithmetic_portability_impl.hlsl>
+
+#endif