Skip to content

Commit 36783a4

Browse files
committed
review: rename RootSigVer to Version
1 parent 25e727b commit 36783a4

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

clang/include/clang/AST/Decl.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5180,7 +5180,7 @@ class HLSLRootSignatureDecl final
51805180
llvm::hlsl::rootsig::RootElement> {
51815181
friend TrailingObjects;
51825182

5183-
llvm::dxbc::RootSignatureVersion RootSigVer;
5183+
llvm::dxbc::RootSignatureVersion Version;
51845184

51855185
unsigned NumElems;
51865186

@@ -5191,19 +5191,19 @@ class HLSLRootSignatureDecl final
51915191
}
51925192

51935193
HLSLRootSignatureDecl(DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
5194-
llvm::dxbc::RootSignatureVersion RootSigVer,
5194+
llvm::dxbc::RootSignatureVersion Verison,
51955195
unsigned NumElems);
51965196

51975197
public:
51985198
static HLSLRootSignatureDecl *
51995199
Create(ASTContext &C, DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
5200-
llvm::dxbc::RootSignatureVersion RootSigVer,
5200+
llvm::dxbc::RootSignatureVersion Version,
52015201
ArrayRef<llvm::hlsl::rootsig::RootElement> RootElements);
52025202

52035203
static HLSLRootSignatureDecl *CreateDeserialized(ASTContext &C,
52045204
GlobalDeclID ID);
52055205

5206-
llvm::dxbc::RootSignatureVersion getVersion() const { return RootSigVer; }
5206+
llvm::dxbc::RootSignatureVersion getVersion() const { return Version; }
52075207

52085208
ArrayRef<llvm::hlsl::rootsig::RootElement> getRootElements() const {
52095209
return {getElems(), NumElems};

clang/lib/AST/Decl.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5855,19 +5855,19 @@ bool HLSLBufferDecl::buffer_decls_empty() {
58555855

58565856
HLSLRootSignatureDecl::HLSLRootSignatureDecl(
58575857
DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
5858-
llvm::dxbc::RootSignatureVersion RootSigVer, unsigned NumElems)
5858+
llvm::dxbc::RootSignatureVersion Version, unsigned NumElems)
58595859
: NamedDecl(Decl::Kind::HLSLRootSignature, DC, Loc, DeclarationName(ID)),
5860-
RootSigVer(RootSigVer), NumElems(NumElems) {}
5860+
Version(Version), NumElems(NumElems) {}
58615861

58625862
HLSLRootSignatureDecl *HLSLRootSignatureDecl::Create(
58635863
ASTContext &C, DeclContext *DC, SourceLocation Loc, IdentifierInfo *ID,
5864-
llvm::dxbc::RootSignatureVersion RootSigVer,
5864+
llvm::dxbc::RootSignatureVersion Version,
58655865
ArrayRef<llvm::hlsl::rootsig::RootElement> RootElements) {
58665866
HLSLRootSignatureDecl *RSDecl =
58675867
new (C, DC,
58685868
additionalSizeToAlloc<llvm::hlsl::rootsig::RootElement>(
58695869
RootElements.size()))
5870-
HLSLRootSignatureDecl(DC, Loc, ID, RootSigVer, RootElements.size());
5870+
HLSLRootSignatureDecl(DC, Loc, ID, Version, RootElements.size());
58715871
auto *StoredElems = RSDecl->getElems();
58725872
std::uninitialized_copy(RootElements.begin(), RootElements.end(),
58735873
StoredElems);
@@ -5876,10 +5876,10 @@ HLSLRootSignatureDecl *HLSLRootSignatureDecl::Create(
58765876

58775877
HLSLRootSignatureDecl *
58785878
HLSLRootSignatureDecl::CreateDeserialized(ASTContext &C, GlobalDeclID ID) {
5879-
HLSLRootSignatureDecl *Result = new (C, ID) HLSLRootSignatureDecl(
5880-
nullptr, SourceLocation(), nullptr,
5881-
/*RootSigVer*/ llvm::dxbc::RootSignatureVersion::V1_1,
5882-
/*NumElems=*/0);
5879+
HLSLRootSignatureDecl *Result = new (C, ID)
5880+
HLSLRootSignatureDecl(nullptr, SourceLocation(), nullptr,
5881+
/*Version*/ llvm::dxbc::RootSignatureVersion::V1_1,
5882+
/*NumElems=*/0);
58835883
return Result;
58845884
}
58855885

0 commit comments

Comments
 (0)