@@ -76,15 +76,15 @@ static FlagType maybeOrFlag(std::optional<FlagType> Flags, FlagType Flag) {
76
76
llvm::to_underlying (Flag));
77
77
}
78
78
79
- std::optional<RootFlags> RootSignatureParser::parseRootFlags () {
79
+ std::optional<llvm::dxbc:: RootFlags> RootSignatureParser::parseRootFlags () {
80
80
assert (CurToken.TokKind == TokenKind::kw_RootFlags &&
81
81
" Expects to only be invoked starting at given keyword" );
82
82
83
83
if (consumeExpectedToken (TokenKind::pu_l_paren, diag::err_expected_after,
84
84
CurToken.TokKind ))
85
85
return std::nullopt;
86
86
87
- std::optional<RootFlags> Flags = RootFlags::None;
87
+ std::optional<llvm::dxbc:: RootFlags> Flags = llvm::dxbc:: RootFlags::None;
88
88
89
89
// Handle the edge-case of '0' to specify no flags set
90
90
if (tryConsumeExpectedToken (TokenKind::int_literal)) {
@@ -104,7 +104,8 @@ std::optional<RootFlags> RootSignatureParser::parseRootFlags() {
104
104
switch (CurToken.TokKind ) {
105
105
#define ROOT_FLAG_ENUM (NAME, LIT ) \
106
106
case TokenKind::en_##NAME: \
107
- Flags = maybeOrFlag<RootFlags>(Flags, RootFlags::NAME); \
107
+ Flags = maybeOrFlag<llvm::dxbc::RootFlags>(Flags, \
108
+ llvm::dxbc::RootFlags::NAME); \
108
109
break ;
109
110
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
110
111
default :
@@ -240,7 +241,7 @@ std::optional<DescriptorTable> RootSignatureParser::parseDescriptorTable() {
240
241
return std::nullopt;
241
242
242
243
DescriptorTable Table;
243
- std::optional<ShaderVisibility> Visibility;
244
+ std::optional<llvm::dxbc:: ShaderVisibility> Visibility;
244
245
245
246
// Iterate as many Clauses as possible
246
247
do {
@@ -983,7 +984,7 @@ std::optional<float> RootSignatureParser::parseFloatParam() {
983
984
return std::nullopt;
984
985
}
985
986
986
- std::optional<llvm::hlsl::rootsig ::ShaderVisibility>
987
+ std::optional<llvm::dxbc ::ShaderVisibility>
987
988
RootSignatureParser::parseShaderVisibility () {
988
989
assert (CurToken.TokKind == TokenKind::pu_equal &&
989
990
" Expects to only be invoked starting at given keyword" );
@@ -999,7 +1000,7 @@ RootSignatureParser::parseShaderVisibility() {
999
1000
switch (CurToken.TokKind ) {
1000
1001
#define SHADER_VISIBILITY_ENUM (NAME, LIT ) \
1001
1002
case TokenKind::en_##NAME: \
1002
- return ShaderVisibility::NAME; \
1003
+ return llvm::dxbc:: ShaderVisibility::NAME; \
1003
1004
break ;
1004
1005
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1005
1006
default :
@@ -1009,7 +1010,7 @@ RootSignatureParser::parseShaderVisibility() {
1009
1010
return std::nullopt;
1010
1011
}
1011
1012
1012
- std::optional<llvm::hlsl::rootsig ::SamplerFilter>
1013
+ std::optional<llvm::dxbc ::SamplerFilter>
1013
1014
RootSignatureParser::parseSamplerFilter () {
1014
1015
assert (CurToken.TokKind == TokenKind::pu_equal &&
1015
1016
" Expects to only be invoked starting at given keyword" );
@@ -1025,7 +1026,7 @@ RootSignatureParser::parseSamplerFilter() {
1025
1026
switch (CurToken.TokKind ) {
1026
1027
#define FILTER_ENUM (NAME, LIT ) \
1027
1028
case TokenKind::en_##NAME: \
1028
- return SamplerFilter::NAME; \
1029
+ return llvm::dxbc:: SamplerFilter::NAME; \
1029
1030
break ;
1030
1031
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1031
1032
default :
@@ -1035,7 +1036,7 @@ RootSignatureParser::parseSamplerFilter() {
1035
1036
return std::nullopt;
1036
1037
}
1037
1038
1038
- std::optional<llvm::hlsl::rootsig ::TextureAddressMode>
1039
+ std::optional<llvm::dxbc ::TextureAddressMode>
1039
1040
RootSignatureParser::parseTextureAddressMode () {
1040
1041
assert (CurToken.TokKind == TokenKind::pu_equal &&
1041
1042
" Expects to only be invoked starting at given keyword" );
@@ -1051,7 +1052,7 @@ RootSignatureParser::parseTextureAddressMode() {
1051
1052
switch (CurToken.TokKind ) {
1052
1053
#define TEXTURE_ADDRESS_MODE_ENUM (NAME, LIT ) \
1053
1054
case TokenKind::en_##NAME: \
1054
- return TextureAddressMode::NAME; \
1055
+ return llvm::dxbc:: TextureAddressMode::NAME; \
1055
1056
break ;
1056
1057
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1057
1058
default :
@@ -1061,7 +1062,7 @@ RootSignatureParser::parseTextureAddressMode() {
1061
1062
return std::nullopt;
1062
1063
}
1063
1064
1064
- std::optional<llvm::hlsl::rootsig ::ComparisonFunc>
1065
+ std::optional<llvm::dxbc ::ComparisonFunc>
1065
1066
RootSignatureParser::parseComparisonFunc () {
1066
1067
assert (CurToken.TokKind == TokenKind::pu_equal &&
1067
1068
" Expects to only be invoked starting at given keyword" );
@@ -1077,7 +1078,7 @@ RootSignatureParser::parseComparisonFunc() {
1077
1078
switch (CurToken.TokKind ) {
1078
1079
#define COMPARISON_FUNC_ENUM (NAME, LIT ) \
1079
1080
case TokenKind::en_##NAME: \
1080
- return ComparisonFunc::NAME; \
1081
+ return llvm::dxbc:: ComparisonFunc::NAME; \
1081
1082
break ;
1082
1083
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1083
1084
default :
@@ -1087,7 +1088,7 @@ RootSignatureParser::parseComparisonFunc() {
1087
1088
return std::nullopt;
1088
1089
}
1089
1090
1090
- std::optional<llvm::hlsl::rootsig ::StaticBorderColor>
1091
+ std::optional<llvm::dxbc ::StaticBorderColor>
1091
1092
RootSignatureParser::parseStaticBorderColor () {
1092
1093
assert (CurToken.TokKind == TokenKind::pu_equal &&
1093
1094
" Expects to only be invoked starting at given keyword" );
@@ -1103,7 +1104,7 @@ RootSignatureParser::parseStaticBorderColor() {
1103
1104
switch (CurToken.TokKind ) {
1104
1105
#define STATIC_BORDER_COLOR_ENUM (NAME, LIT ) \
1105
1106
case TokenKind::en_##NAME: \
1106
- return StaticBorderColor::NAME; \
1107
+ return llvm::dxbc:: StaticBorderColor::NAME; \
1107
1108
break ;
1108
1109
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1109
1110
default :
@@ -1113,7 +1114,7 @@ RootSignatureParser::parseStaticBorderColor() {
1113
1114
return std::nullopt;
1114
1115
}
1115
1116
1116
- std::optional<llvm::hlsl::rootsig ::RootDescriptorFlags>
1117
+ std::optional<llvm::dxbc ::RootDescriptorFlags>
1117
1118
RootSignatureParser::parseRootDescriptorFlags () {
1118
1119
assert (CurToken.TokKind == TokenKind::pu_equal &&
1119
1120
" Expects to only be invoked starting at given keyword" );
@@ -1124,23 +1125,23 @@ RootSignatureParser::parseRootDescriptorFlags() {
1124
1125
getDiags ().Report (CurToken.TokLoc , diag::err_hlsl_rootsig_non_zero_flag);
1125
1126
return std::nullopt;
1126
1127
}
1127
- return RootDescriptorFlags::None;
1128
+ return llvm::dxbc:: RootDescriptorFlags::None;
1128
1129
}
1129
1130
1130
1131
TokenKind Expected[] = {
1131
1132
#define ROOT_DESCRIPTOR_FLAG_ENUM (NAME, LIT ) TokenKind::en_##NAME,
1132
1133
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1133
1134
};
1134
1135
1135
- std::optional<RootDescriptorFlags> Flags;
1136
+ std::optional<llvm::dxbc:: RootDescriptorFlags> Flags;
1136
1137
1137
1138
do {
1138
1139
if (tryConsumeExpectedToken (Expected)) {
1139
1140
switch (CurToken.TokKind ) {
1140
1141
#define ROOT_DESCRIPTOR_FLAG_ENUM (NAME, LIT ) \
1141
1142
case TokenKind::en_##NAME: \
1142
- Flags = \
1143
- maybeOrFlag<RootDescriptorFlags>( Flags, RootDescriptorFlags::NAME); \
1143
+ Flags = maybeOrFlag<llvm::dxbc::RootDescriptorFlags>( \
1144
+ Flags, llvm::dxbc:: RootDescriptorFlags::NAME); \
1144
1145
break ;
1145
1146
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1146
1147
default :
@@ -1152,7 +1153,7 @@ RootSignatureParser::parseRootDescriptorFlags() {
1152
1153
return Flags;
1153
1154
}
1154
1155
1155
- std::optional<llvm::hlsl::rootsig ::DescriptorRangeFlags>
1156
+ std::optional<llvm::dxbc ::DescriptorRangeFlags>
1156
1157
RootSignatureParser::parseDescriptorRangeFlags () {
1157
1158
assert (CurToken.TokKind == TokenKind::pu_equal &&
1158
1159
" Expects to only be invoked starting at given keyword" );
@@ -1163,23 +1164,23 @@ RootSignatureParser::parseDescriptorRangeFlags() {
1163
1164
getDiags ().Report (CurToken.TokLoc , diag::err_hlsl_rootsig_non_zero_flag);
1164
1165
return std::nullopt;
1165
1166
}
1166
- return DescriptorRangeFlags::None;
1167
+ return llvm::dxbc:: DescriptorRangeFlags::None;
1167
1168
}
1168
1169
1169
1170
TokenKind Expected[] = {
1170
1171
#define DESCRIPTOR_RANGE_FLAG_ENUM (NAME, LIT, ON ) TokenKind::en_##NAME,
1171
1172
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1172
1173
};
1173
1174
1174
- std::optional<DescriptorRangeFlags> Flags;
1175
+ std::optional<llvm::dxbc:: DescriptorRangeFlags> Flags;
1175
1176
1176
1177
do {
1177
1178
if (tryConsumeExpectedToken (Expected)) {
1178
1179
switch (CurToken.TokKind ) {
1179
1180
#define DESCRIPTOR_RANGE_FLAG_ENUM (NAME, LIT, ON ) \
1180
1181
case TokenKind::en_##NAME: \
1181
- Flags = \
1182
- maybeOrFlag<DescriptorRangeFlags>( Flags, DescriptorRangeFlags::NAME); \
1182
+ Flags = maybeOrFlag<llvm::dxbc::DescriptorRangeFlags>( \
1183
+ Flags, llvm::dxbc:: DescriptorRangeFlags::NAME); \
1183
1184
break ;
1184
1185
#include " clang/Lex/HLSLRootSignatureTokenKinds.def"
1185
1186
default :
0 commit comments