Move comparator_lt_t to binops.hlsl and create gt, gte, lte

Author: kpentaris

include/nbl/builtin/hlsl/algorithm.hlsl

@@ -4,6 +4,8 @@
 #ifndef _NBL_BUILTIN_HLSL_ALGORITHM_INCLUDED_
 #define _NBL_BUILTIN_HLSL_ALGORITHM_INCLUDED_
 
+#include "binops.hlsl"
+
 namespace nbl
 {
 namespace hlsl
@@ -109,27 +111,18 @@ uint upper_bound(inout Accessor accessor, const uint begin, const uint end, cons
 namespace impl
 {
 
-template<typename T>
-struct comparator_lt_t
-{
-    bool operator()(const T lhs, const T rhs)
-    {
-        return lhs<rhs;
-    }
-};
-
 // extra indirection due to https://github.com/microsoft/DirectXShaderCompiler/issues/4771
 template<class Accessor, typename T>
 uint lower_bound(inout Accessor accessor, const uint begin, const uint end, const T value)
 {
-    using Comparator = impl::comparator_lt_t<T>;
+    using Comparator = binops::comparator_lt_t<T>;
     Comparator comp;
     return nbl::hlsl::lower_bound<Accessor,Comparator>(accessor,begin,end,value,comp);
 }
 template<class Accessor, typename T>
 uint upper_bound(inout Accessor accessor, const uint begin, const uint end, const T value)
 {
-    using Comparator = impl::comparator_lt_t<T>;
+    using Comparator = binops::comparator_lt_t<T>;
     Comparator comp;
     return nbl::hlsl::upper_bound<Accessor,Comparator>(accessor,begin,end,value,comp);
 }

include/nbl/builtin/hlsl/binops.hlsl

@@ -3,13 +3,11 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #ifndef _NBL_BUILTIN_HLSL_BINOPS_INCLUDED_
 #define _NBL_BUILTIN_HLSL_BINOPS_INCLUDED_
-// TODO (PentaKon): Should this file be renamed to binops.hlsl ?
 // TODO (PentaKon): Should we move isNPoT from algorithm.hlsl to this file ?
 namespace nbl
 {
 namespace hlsl
 {
-// TODO (PentaKon): NBL_GLSL_EVAL? Keep as macro or don't use at all?
 namespace binops
 {
 template<typename T>
@@ -66,6 +64,42 @@ struct max
     }
 };
 
+template<typename T>
+struct comparator_lt_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs<rhs;
+    }
+};
+
+template<typename T>
+struct comparator_gt_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs>rhs;
+    }
+};
+
+template<typename T>
+struct comparator_lte_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs<=rhs;
+    }
+};
+
+template<typename T>
+struct comparator_gte_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs>=rhs;
+    }
+};
+
 }
 }
 }