|
4 | 4 | #ifndef _NBL_BUILTIN_HLSL_ALGORITHM_INCLUDED_ |
5 | 5 | #define _NBL_BUILTIN_HLSL_ALGORITHM_INCLUDED_ |
6 | 6 |
|
| 7 | +#include "nbl/builtin/hlsl/functional.hlsl" |
| 8 | + |
7 | 9 | namespace nbl |
8 | 10 | { |
9 | 11 | namespace hlsl |
@@ -115,20 +117,20 @@ namespace impl |
115 | 117 | template<class Accessor, typename T> |
116 | 118 | uint lower_bound(inout Accessor accessor, const uint begin, const uint end, const T value) |
117 | 119 | { |
118 | | - //using Comparator = impl::comparator_lt_t<T>; |
| 120 | + //using Comparator = nbl::hlsl::less<T>; |
119 | 121 | //Comparator comp; |
120 | 122 |
|
121 | | - impl::comparator_lt_t<T> comp; |
122 | | - return nbl::hlsl::lower_bound<Accessor,impl::comparator_lt_t<T> >(accessor,begin,end,value,comp); |
| 123 | + nbl::hlsl::less<T> comp; |
| 124 | + return nbl::hlsl::lower_bound<Accessor, nbl::hlsl::less<T> >(accessor,begin,end,value,comp); |
123 | 125 | } |
124 | 126 | template<class Accessor, typename T> |
125 | 127 | uint upper_bound(inout Accessor accessor, const uint begin, const uint end, const T value) |
126 | 128 | { |
127 | | - //using Comparator = impl::comparator_lt_t<T>; |
| 129 | + //using Comparator = nbl::hlsl::less<T>; |
128 | 130 | //Comparator comp; |
129 | 131 |
|
130 | | - impl::comparator_lt_t<T> comp; |
131 | | - return nbl::hlsl::upper_bound<Accessor,impl::comparator_lt_t<T> >(accessor,begin,end,value,comp); |
| 132 | + nbl::hlsl::less<T> comp; |
| 133 | + return nbl::hlsl::upper_bound<Accessor, nbl::hlsl::less<T> >(accessor,begin,end,value,comp); |
132 | 134 | } |
133 | 135 |
|
134 | 136 | } |
|
0 commit comments