Skip to content

Commit 932062e

Browse files
author
joaosaffran
committed
remove version
1 parent 0ed658a commit 932062e

File tree

8 files changed

+1
-14
lines changed

8 files changed

+1
-14
lines changed

llvm/include/llvm/MC/DXContainerRootSignature.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class raw_ostream;
1515

1616
namespace mcdxbc {
1717
struct RootSignatureHeader {
18-
uint32_t Version;
1918
uint32_t Flags;
2019

2120
void swapBytes();

llvm/include/llvm/Object/DXContainer.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ class RootSignature {
121121
private:
122122
StringRef Data;
123123
uint32_t Size;
124-
uint32_t Version;
125124
uint32_t Flags;
126125

127126
public:
@@ -131,8 +130,6 @@ class RootSignature {
131130

132131
uint32_t getSize() const { return Size; }
133132

134-
uint32_t getVersion() const { return Version; }
135-
136133
uint32_t getFlags() const { return Flags; }
137134
};
138135

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ struct RootSignatureDesc {
8080

8181
uint32_t getEncodedFlags();
8282
uint32_t Size;
83-
uint32_t Version;
8483
uint32_t NumParameters;
8584
SmallVector<dxbc::RootParameter> Parameters;
8685

llvm/lib/MC/DXContainerRootSignature.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ void RootSignatureHeader::write(raw_ostream &OS) {
1818

1919
uint32_t SizeInfo = sizeof(this);
2020
support::endian::write(OS, SizeInfo, llvm::endianness::little);
21-
support::endian::write(OS, Version, llvm::endianness::little);
2221
support::endian::write(OS, Flags, llvm::endianness::little);
2322
}

llvm/lib/Object/DXContainer.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,6 @@ Error DirectX::RootSignature::parse() {
248248
Size = support::endian::read<uint32_t, llvm::endianness::little>(Current);
249249
Current += sizeof(uint32_t);
250250

251-
Version = support::endian::read<uint32_t, llvm::endianness::little>(Current);
252-
Current += sizeof(uint32_t);
253-
254251
Flags = support::endian::read<uint32_t, llvm::endianness::little>(Current);
255252
Current += sizeof(uint32_t);
256253

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
267267
continue;
268268

269269
mcdxbc::RootSignatureHeader Header;
270-
Header.Version = P.RootSignature->Version;
271270
Header.Flags = P.RootSignature->getEncodedFlags();
272271

273272
Header.write(OS);

llvm/lib/ObjectYAML/DXContainerYAML.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DXContainerYAML::ShaderFeatureFlags::ShaderFeatureFlags(uint64_t FlagData) {
3232

3333
DXContainerYAML::RootSignatureDesc::RootSignatureDesc(
3434
const object::DirectX::RootSignature &Data)
35-
: Size(Data.getSize()), Version(Data.getVersion()) {
35+
: Size(Data.getSize()) {
3636
uint32_t Flags = Data.getFlags();
3737
#define ROOT_ELEMENT_FLAG(Num, Val, Str) \
3838
Val = (Flags & (uint32_t)dxbc::RootElementFlag::Val) > 0;
@@ -210,7 +210,6 @@ void MappingTraits<DXContainerYAML::Signature>::mapping(
210210
void MappingTraits<DXContainerYAML::RootSignatureDesc>::mapping(
211211
IO &IO, DXContainerYAML::RootSignatureDesc &S) {
212212
IO.mapRequired("Size", S.Size);
213-
IO.mapRequired("Version", S.Version);
214213
#define ROOT_ELEMENT_FLAG(Num, Val, Str) IO.mapOptional(#Val, S.Val, false);
215214
#include "llvm/BinaryFormat/DXContainerConstants.def"
216215
}

llvm/test/ObjectYAML/DXContainer/RootSignature-Flags.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ Parts:
1313
Size: 8
1414
RootSignature:
1515
Size: 8
16-
Version: 1
1716
AllowInputAssemblerInputLayout: true
1817

1918
#CHECK: - Name: RTS0
2019
#CHECK-NEXT: Size: 8
2120
#CHECK-NEXT: RootSignature:
2221
#CHECK-NEXT: Size: 8
23-
#CHECK-NEXT: Version: 1
2422
#CHECK-NEXT: AllowInputAssemblerInputLayout: true

0 commit comments

Comments
 (0)