Skip to content

Commit 1eabfe2

Browse files
committed
pre-req: add keywords
1 parent c8eb094 commit 1eabfe2

File tree

2 files changed

+22
-1
lines changed

2 files changed

+22
-1
lines changed

clang/include/clang/Lex/HLSLRootSignatureTokenKinds.def

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
#ifndef SHADER_VISIBILITY_ENUM
5454
#define SHADER_VISIBILITY_ENUM(NAME, LIT) ENUM(NAME, LIT)
5555
#endif
56+
#ifndef TEXTURE_ADDRESS_MODE_ENUM
57+
#define TEXTURE_ADDRESS_MODE_ENUM(NAME, LIT) ENUM(NAME, LIT)
58+
#endif
5659

5760
// General Tokens:
5861
TOK(invalid, "invalid identifier")
@@ -102,6 +105,9 @@ KEYWORD(offset)
102105

103106
// StaticSampler Keywords:
104107
KEYWORD(mipLODBias)
108+
KEYWORD(addressU)
109+
KEYWORD(addressV)
110+
KEYWORD(addressW)
105111
KEYWORD(maxAnisotropy)
106112
KEYWORD(minLOD)
107113
KEYWORD(maxLOD)
@@ -148,6 +154,14 @@ SHADER_VISIBILITY_ENUM(Pixel, "SHADER_VISIBILITY_PIXEL")
148154
SHADER_VISIBILITY_ENUM(Amplification, "SHADER_VISIBILITY_AMPLIFICATION")
149155
SHADER_VISIBILITY_ENUM(Mesh, "SHADER_VISIBILITY_MESH")
150156

157+
// Texture Address Mode Enums:
158+
TEXTURE_ADDRESS_MODE_ENUM(Wrap, "TEXTURE_ADDRESS_WRAP")
159+
TEXTURE_ADDRESS_MODE_ENUM(Mirror, "TEXTURE_ADDRESS_MIRROR")
160+
TEXTURE_ADDRESS_MODE_ENUM(Clamp, "TEXTURE_ADDRESS_CLAMP")
161+
TEXTURE_ADDRESS_MODE_ENUM(Border, "TEXTURE_ADDRESS_BORDER")
162+
TEXTURE_ADDRESS_MODE_ENUM(MirrorOnce, "TEXTURE_ADDRESS_MIRRORONCE")
163+
164+
#undef TEXTURE_ADDRESS_MODE_ENUM
151165
#undef SHADER_VISIBILITY_ENUM
152166
#undef DESCRIPTOR_RANGE_FLAG_ENUM
153167
#undef DESCRIPTOR_RANGE_FLAG_ENUM_OFF

clang/unittests/Lex/LexHLSLRootSignatureTest.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ TEST_F(LexHLSLRootSignatureTest, ValidLexAllTokensTest) {
136136
space visibility flags
137137
numDescriptors offset
138138
139-
mipLODBias maxAnisotropy minLOD maxLOD
139+
mipLODBias addressU addressV addressW
140+
maxAnisotropy minLOD maxLOD
140141
141142
unbounded
142143
DESCRIPTOR_RANGE_OFFSET_APPEND
@@ -168,6 +169,12 @@ TEST_F(LexHLSLRootSignatureTest, ValidLexAllTokensTest) {
168169
shader_visibility_pixel
169170
shader_visibility_amplification
170171
shader_visibility_mesh
172+
173+
TEXTURE_ADDRESS_WRAP
174+
TEXTURE_ADDRESS_MIRROR
175+
TEXTURE_ADDRESS_CLAMP
176+
TEXTURE_ADDRESS_BORDER
177+
TEXTURE_ADDRESS_MIRRORONCE
171178
)cc";
172179
auto TokLoc = SourceLocation();
173180
hlsl::RootSignatureLexer Lexer(Source, TokLoc);

0 commit comments

Comments
 (0)