Skip to content

Commit 4b177e2

Browse files
author
joaosaffran
committed
addressing pr comments
1 parent 17abc82 commit 4b177e2

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

llvm/include/llvm/BinaryFormat/DXContainer.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,13 +579,7 @@ struct RootParameter {
579579
};
580580
dxbc::ShaderVisibility ShaderVisibility;
581581

582-
RootParameter() {
583-
ParameterType = dxbc::RootParameterType::Empty;
584-
ShaderVisibility = dxbc::ShaderVisibility::Empty;
585-
}
586-
587582
void swapBytes() {
588-
sys::swapByteOrder(ParameterType);
589583
sys::swapByteOrder(ShaderVisibility);
590584
switch (ParameterType) {
591585
case RootParameterType::Constants32Bit:
@@ -595,6 +589,7 @@ struct RootParameter {
595589
llvm_unreachable("invalid value for ParameterType");
596590
break;
597591
}
592+
sys::swapByteOrder(ParameterType);
598593
}
599594
};
600595

llvm/include/llvm/MC/DXContainerRootSignature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct RootSignatureDesc {
1919

2020
dxbc::RootSignatureHeader Header;
2121
SmallVector<dxbc::RootParameter> Parameters;
22-
RootSignatureDesc() { Header = dxbc::RootSignatureHeader{2, 0}; }
22+
RootSignatureDesc() : Header(dxbc::RootSignatureHeader{2, 0}) {}
2323

2424
void write(raw_ostream &OS) const;
2525
};

llvm/include/llvm/Object/DXContainer.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ class RootSignature {
137137
uint32_t getRootParametersOffset() const { return RootParametersOffset; }
138138
uint32_t getNumStaticSamplers() const { return NumStaticSamplers; }
139139
uint32_t getStaticSamplersOffset() const { return StaticSamplersOffset; }
140-
SmallVector<dxbc::RootParameter> getParameters() const { return Parameters; }
140+
const SmallVector<dxbc::RootParameter> &getParameters() const {
141+
return Parameters;
142+
}
141143
uint32_t getFlags() const { return Flags; }
142144
};
143145

llvm/lib/Object/DXContainer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ Error DirectX::RootSignature::parse(StringRef Data) {
319319

320320
switch (NewParam.ParameterType) {
321321

322-
case dxbc::RootParameterType::Constants32Bit: {
322+
case dxbc::RootParameterType::Constants32Bit:
323323
if (Error Err = readStruct(Data, Begin + Offset, NewParam.Constants))
324324
return Err;
325-
} break;
325+
break;
326326
case dxbc::RootParameterType::Empty:
327327
// unreachable because it was validated and assigned before this point.
328328
llvm_unreachable("Invalid value for RootParameterType");

0 commit comments

Comments
 (0)