Skip to content

Commit 94fe1f4

Browse files
committed
add 'bitwise_' prefix on all binops
1 parent 30c9d71 commit 94fe1f4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

include/nbl/builtin/hlsl/binops.hlsl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace hlsl
1111
namespace binops
1212
{
1313
template<typename T>
14-
struct and
14+
struct bitwise_and
1515
{
1616
T operator()(const T lhs, const T rhs)
1717
{
@@ -20,7 +20,7 @@ struct and
2020
};
2121

2222
template<typename T>
23-
struct or
23+
struct bitwise_or
2424
{
2525
T operator()(const T lhs, const T rhs)
2626
{
@@ -29,7 +29,7 @@ struct or
2929
};
3030

3131
template<typename T>
32-
struct xor
32+
struct bitwise_xor
3333
{
3434
T operator()(const T lhs, const T rhs)
3535
{
@@ -38,7 +38,7 @@ struct xor
3838
};
3939

4040
template<typename T>
41-
struct mul
41+
struct bitwise_mul
4242
{
4343
T operator()(const T lhs, const T rhs)
4444
{
@@ -47,7 +47,7 @@ struct mul
4747
};
4848

4949
template<typename T, class Comparator>
50-
struct min
50+
struct bitwise_min
5151
{
5252
T operator()(const T lhs, const T rhs, inout Comparator comp)
5353
{
@@ -56,7 +56,7 @@ struct min
5656
};
5757

5858
template<typename T>
59-
struct min
59+
struct bitwise_min
6060
{
6161
T operator()(const T lhs, const T rhs)
6262
{
@@ -66,7 +66,7 @@ struct min
6666
};
6767

6868
template<typename T, class Comparator>
69-
struct max
69+
struct bitwise_max
7070
{
7171
T operator()(const T lhs, const T rhs, in Comparator comp)
7272
{
@@ -75,7 +75,7 @@ struct max
7575
};
7676

7777
template<typename T>
78-
struct max
78+
struct bitwise_max
7979
{
8080
T operator()(const T lhs, const T rhs)
8181
{

0 commit comments

Comments
 (0)