Skip to content

Commit 440566c

Browse files
author
joaosaffran
committed
addressing comments
1 parent 72b8dbc commit 440566c

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed

diff

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/llvm/include/llvm/BinaryFormat/DXContainer.h b/llvm/include/llvm/BinaryFormat/DXContainer.h
2+
index 08949e39716d..725c405b77e5 100644
3+
--- a/llvm/include/llvm/BinaryFormat/DXContainer.h
4+
+++ b/llvm/include/llvm/BinaryFormat/DXContainer.h
5+
@@ -164,7 +164,7 @@ enum class RootDescriptorFlag : uint32_t {
6+
#include "DXContainerConstants.def"
7+
};
8+
9+
-#define DESCRIPTOR_RANGE_FLAG(Num, Val) Val = 1ull << Num,
10+
+#define DESCRIPTOR_RANGE_FLAG(Num, Val) Val = Num,
11+
enum class DescriptorRangeFlag : uint32_t {
12+
#include "DXContainerConstants.def"
13+
};
14+
diff --git a/llvm/include/llvm/BinaryFormat/DXContainerConstants.def b/llvm/include/llvm/BinaryFormat/DXContainerConstants.def
15+
index 501ef0c31cdd..c4895ee8ed65 100644
16+
--- a/llvm/include/llvm/BinaryFormat/DXContainerConstants.def
17+
+++ b/llvm/include/llvm/BinaryFormat/DXContainerConstants.def
18+
@@ -90,11 +90,11 @@ ROOT_DESCRIPTOR_FLAG(3, DATA_STATIC)
19+
#ifdef DESCRIPTOR_RANGE_FLAG
20+
21+
DESCRIPTOR_RANGE_FLAG(0, NONE)
22+
-DESCRIPTOR_RANGE_FLAG(1, DESCRIPTORS_VOLATILE)
23+
-DESCRIPTOR_RANGE_FLAG(2, DATA_VOLATILE)
24+
-DESCRIPTOR_RANGE_FLAG(3, DATA_STATIC_WHILE_SET_AT_EXECUTE)
25+
-DESCRIPTOR_RANGE_FLAG(4, DATA_STATIC)
26+
-DESCRIPTOR_RANGE_FLAG(16, DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS)
27+
+DESCRIPTOR_RANGE_FLAG(0x1, DESCRIPTORS_VOLATILE)
28+
+DESCRIPTOR_RANGE_FLAG(0x2, DATA_VOLATILE)
29+
+DESCRIPTOR_RANGE_FLAG(0x4, DATA_STATIC_WHILE_SET_AT_EXECUTE)
30+
+DESCRIPTOR_RANGE_FLAG(0x8, DATA_STATIC)
31+
+DESCRIPTOR_RANGE_FLAG(0x10000, DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS)
32+
#undef DESCRIPTOR_RANGE_FLAG
33+
#endif // DESCRIPTOR_RANGE_FLAG
34+

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ DESCRIPTOR_RANGE_FLAG(16, DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS)
100100

101101
// DESCRIPTOR_RANGE(value, name).
102102
#ifdef DESCRIPTOR_RANGE
103-
DESCRIPTOR_RANGE(4, ERROR)
104-
DESCRIPTOR_RANGE(0, SRV)
105-
DESCRIPTOR_RANGE(1, UAV)
106-
DESCRIPTOR_RANGE(2, CBV)
107-
DESCRIPTOR_RANGE(3, Sampler)
103+
DESCRIPTOR_RANGE(4, ERROR)
104+
DESCRIPTOR_RANGE(0, SRV)
105+
DESCRIPTOR_RANGE(1, UAV)
106+
DESCRIPTOR_RANGE(2, CBV)
107+
DESCRIPTOR_RANGE(3, Sampler)
108108
DESCRIPTOR_RANGE(0, NONE)
109109
#undef DESCRIPTOR_RANGE
110110
#endif // DESCRIPTOR_RANGE

0 commit comments

Comments
 (0)