Skip to content

Commit 29f7bad

Browse files
committed
rebase-fix: remove unneeded params
- these are lingering from the improve diag related changes
1 parent dfde6d4 commit 29f7bad

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

clang/include/clang/Parse/ParseHLSLRootSignature.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ class RootSignatureParser {
9999
std::optional<llvm::dxbc::RootDescriptorFlags> Flags;
100100
};
101101
std::optional<ParsedRootDescriptorParams>
102-
parseRootDescriptorParams(RootSignatureToken::Kind DescType,
103-
RootSignatureToken::Kind RegType);
102+
parseRootDescriptorParams(RootSignatureToken::Kind RegType);
104103

105104
struct ParsedClauseParams {
106105
std::optional<llvm::hlsl::rootsig::Register> Reg;
@@ -110,8 +109,7 @@ class RootSignatureParser {
110109
std::optional<llvm::dxbc::DescriptorRangeFlags> Flags;
111110
};
112111
std::optional<ParsedClauseParams>
113-
parseDescriptorTableClauseParams(RootSignatureToken::Kind DescType,
114-
RootSignatureToken::Kind RegType);
112+
parseDescriptorTableClauseParams(RootSignatureToken::Kind RegType);
115113

116114
struct ParsedStaticSamplerParams {
117115
std::optional<llvm::hlsl::rootsig::Register> Reg;

clang/lib/Parse/ParseHLSLRootSignature.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ std::optional<RootDescriptor> RootSignatureParser::parseRootDescriptor() {
199199
}
200200
Descriptor.setDefaultFlags(Version);
201201

202-
auto Params = parseRootDescriptorParams(DescriptorKind, ExpectedReg);
202+
auto Params = parseRootDescriptorParams(ExpectedReg);
203203
if (!Params.has_value())
204204
return std::nullopt;
205205

@@ -320,7 +320,7 @@ RootSignatureParser::parseDescriptorTableClause() {
320320
}
321321
Clause.setDefaultFlags(Version);
322322

323-
auto Params = parseDescriptorTableClauseParams(ParamKind, ExpectedReg);
323+
auto Params = parseDescriptorTableClauseParams(ExpectedReg);
324324
if (!Params.has_value())
325325
return std::nullopt;
326326

@@ -493,8 +493,7 @@ RootSignatureParser::parseRootConstantParams() {
493493
}
494494

495495
std::optional<RootSignatureParser::ParsedRootDescriptorParams>
496-
RootSignatureParser::parseRootDescriptorParams(TokenKind DescType,
497-
TokenKind RegType) {
496+
RootSignatureParser::parseRootDescriptorParams(TokenKind RegType) {
498497
assert(CurToken.TokKind == TokenKind::pu_l_paren &&
499498
"Expects to only be invoked starting at given token");
500499

@@ -563,8 +562,7 @@ RootSignatureParser::parseRootDescriptorParams(TokenKind DescType,
563562
}
564563

565564
std::optional<RootSignatureParser::ParsedClauseParams>
566-
RootSignatureParser::parseDescriptorTableClauseParams(TokenKind DescType,
567-
TokenKind RegType) {
565+
RootSignatureParser::parseDescriptorTableClauseParams(TokenKind RegType) {
568566
assert(CurToken.TokKind == TokenKind::pu_l_paren &&
569567
"Expects to only be invoked starting at given token");
570568

0 commit comments

Comments
 (0)