Skip to content

Commit 168dc09

Browse files
committed
nfc: misc clean to make it consistent
1 parent 3fb4908 commit 168dc09

File tree

2 files changed

+29
-24
lines changed

2 files changed

+29
-24
lines changed

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ ROOT_PARAMETER(4, UAV)
124124
#undef ROOT_PARAMETER
125125
#endif // ROOT_PARAMETER
126126

127+
// SHADER_VISIBILITY(value, enum).
127128
#ifdef SHADER_VISIBILITY
128129

129130
SHADER_VISIBILITY(0, All)
@@ -134,10 +135,11 @@ SHADER_VISIBILITY(4, Geometry)
134135
SHADER_VISIBILITY(5, Pixel)
135136
SHADER_VISIBILITY(6, Amplification)
136137
SHADER_VISIBILITY(7, Mesh)
138+
137139
#undef SHADER_VISIBILITY
138140
#endif // SHADER_VISIBILITY
139141

140-
// #FILTER(value, enum).
142+
// FILTER(value, enum).
141143
#ifdef FILTER
142144

143145
FILTER(0, MinMagMipPoint)
@@ -176,38 +178,46 @@ FILTER(0x191, MaximumMinLinearMagPointMipLinear)
176178
FILTER(0x194, MaximumMinMagLinearMipPoint)
177179
FILTER(0x195, MaximumMinMagMipLinear)
178180
FILTER(0x1d5, MaximumAnisotropic)
181+
179182
#undef FILTER
180183
#endif // FILTER
181184

185+
// TEXTURE_ADDRESS_MODE(value, enum).
182186
#ifdef TEXTURE_ADDRESS_MODE
183187

184-
TEXTURE_ADDRESS_MODE( 1, Wrap)
185-
TEXTURE_ADDRESS_MODE( 2, Mirror)
186-
TEXTURE_ADDRESS_MODE( 3, Clamp)
187-
TEXTURE_ADDRESS_MODE( 4, Border)
188-
TEXTURE_ADDRESS_MODE( 5, MirrorOnce)
188+
TEXTURE_ADDRESS_MODE(1, Wrap)
189+
TEXTURE_ADDRESS_MODE(2, Mirror)
190+
TEXTURE_ADDRESS_MODE(3, Clamp)
191+
TEXTURE_ADDRESS_MODE(4, Border)
192+
TEXTURE_ADDRESS_MODE(5, MirrorOnce)
193+
189194
#undef TEXTURE_ADDRESS_MODE
190195
#endif // TEXTURE_ADDRESS_MODE
191196

197+
// COMPARISON_FUNC(value, enum).
192198
#ifdef COMPARISON_FUNC
193199

194-
COMPARISON_FUNC( 1, Never)
195-
COMPARISON_FUNC( 2, Less)
196-
COMPARISON_FUNC( 3, Equal)
197-
COMPARISON_FUNC( 4, LessEqual)
198-
COMPARISON_FUNC( 5, Greater)
199-
COMPARISON_FUNC( 6, NotEqual)
200-
COMPARISON_FUNC( 7, GreaterEqual)
201-
COMPARISON_FUNC( 8, Always)
200+
COMPARISON_FUNC(1, Never)
201+
COMPARISON_FUNC(2, Less)
202+
COMPARISON_FUNC(3, Equal)
203+
COMPARISON_FUNC(4, LessEqual)
204+
COMPARISON_FUNC(5, Greater)
205+
COMPARISON_FUNC(6, NotEqual)
206+
COMPARISON_FUNC(7, GreaterEqual)
207+
COMPARISON_FUNC(8, Always)
208+
202209
#undef COMPARISON_FUNC
203210
#endif // COMPARISON_FUNC
204211

212+
// STATIC_BORDER_COLOR(value, enum).
205213
#ifdef STATIC_BORDER_COLOR
206-
STATIC_BORDER_COLOR( 0, TransparentBlack)
207-
STATIC_BORDER_COLOR( 1, OpaqueBlack)
208-
STATIC_BORDER_COLOR( 2, OpaqueWhite)
209-
STATIC_BORDER_COLOR( 3, OpaqueBlackUint)
210-
STATIC_BORDER_COLOR( 4, OpaqueWhiteUint)
214+
215+
STATIC_BORDER_COLOR(0, TransparentBlack)
216+
STATIC_BORDER_COLOR(1, OpaqueBlack)
217+
STATIC_BORDER_COLOR(2, OpaqueWhite)
218+
STATIC_BORDER_COLOR(3, OpaqueBlackUint)
219+
STATIC_BORDER_COLOR(4, OpaqueWhiteUint)
220+
211221
#undef STATIC_BORDER_COLOR
212222
#endif // STATIC_BORDER_COLOR
213223

llvm/include/llvm/Frontend/HLSL/HLSLRootSignature.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ namespace llvm {
2424
namespace hlsl {
2525
namespace rootsig {
2626

27-
// Definition of the various enumerations and flags. The definitions of all
28-
// values here correspond to their description in the d3d12.h header and are
29-
// carried over from their values in DXC. For reference:
30-
// https://learn.microsoft.com/en-us/windows/win32/api/d3d12/
31-
3227
// Definitions of the in-memory data layout structures
3328

3429
// Models the different registers: bReg | tReg | uReg | sReg

0 commit comments

Comments
 (0)