Skip to content

Commit 7582ca6

Browse files
author
joaosaffran
committed
fix formating
1 parent be3764d commit 7582ca6

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

llvm/include/llvm/BinaryFormat/DXContainer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ struct ShaderHash {
6666
struct RootSignatureDesc {
6767
uint32_t Version;
6868
uint32_t Flags;
69-
void swapBytes() {
69+
void swapBytes() {
7070
sys::swapByteOrder(Version);
71-
sys::swapByteOrder(Flags);
71+
sys::swapByteOrder(Flags);
7272
}
7373
};
7474

llvm/include/llvm/Object/DXContainer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,7 @@ class DXContainer {
384384

385385
std::optional<dxbc::ShaderHash> getShaderHash() const { return Hash; }
386386

387-
std::optional<dxbc::RootSignatureDesc>
388-
getRootSignature() const {
387+
std::optional<dxbc::RootSignatureDesc> getRootSignature() const {
389388
return RootSignature;
390389
}
391390

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ struct ShaderHash {
7272
std::vector<llvm::yaml::Hex8> Digest;
7373
};
7474

75-
7675
#define ROOT_ELEMENT_FLAG(Num, Val) bool Val = false;
7776
struct RootSignatureDesc {
7877
RootSignatureDesc() = default;

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void DXContainerWriter::writeParts(raw_ostream &OS) {
267267
uint32_t Flags = P.RootSignature->getEncodedFlags();
268268
if (sys::IsBigEndianHost)
269269
sys::swapByteOrder(Flags);
270-
dxbc::RootSignatureDesc RS = {P.RootSignature->Version, Flags};
270+
dxbc::RootSignatureDesc RS = {P.RootSignature->Version, Flags};
271271
if (sys::IsBigEndianHost)
272272
RS.swapBytes();
273273
OS.write(reinterpret_cast<char *>(&RS), sizeof(dxbc::RootSignatureDesc));

llvm/lib/ObjectYAML/DXContainerYAML.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ DXContainerYAML::ShaderFeatureFlags::ShaderFeatureFlags(uint64_t FlagData) {
3030
#include "llvm/BinaryFormat/DXContainerConstants.def"
3131
}
3232

33-
34-
DXContainerYAML::RootSignatureDesc::RootSignatureDesc(const dxbc::RootSignatureDesc &Data): Version(Data.Version) {
35-
#define ROOT_ELEMENT_FLAG(Num, Val) \
33+
DXContainerYAML::RootSignatureDesc::RootSignatureDesc(
34+
const dxbc::RootSignatureDesc &Data)
35+
: Version(Data.Version) {
36+
#define ROOT_ELEMENT_FLAG(Num, Val) \
3637
Val = (Data.Flags & (uint32_t)dxbc::RootElementFlag::Val) > 0;
3738
#include "llvm/BinaryFormat/DXContainerConstants.def"
3839
}
3940

40-
4141
uint32_t DXContainerYAML::RootSignatureDesc::getEncodedFlags() {
4242
uint64_t Flag = 0;
43-
#define ROOT_ELEMENT_FLAG(Num, Val) \
43+
#define ROOT_ELEMENT_FLAG(Num, Val) \
4444
if (Val) \
4545
Flag |= (uint32_t)dxbc::RootElementFlag::Val;
4646
#include "llvm/BinaryFormat/DXContainerConstants.def"
@@ -209,9 +209,8 @@ void MappingTraits<DXContainerYAML::Signature>::mapping(
209209
void MappingTraits<DXContainerYAML::RootSignatureDesc>::mapping(
210210
IO &IO, DXContainerYAML::RootSignatureDesc &S) {
211211
IO.mapRequired("Version", S.Version);
212-
#define ROOT_ELEMENT_FLAG(Num, Val) \
213-
IO.mapRequired(#Val, S.Val);
214-
#include "llvm/BinaryFormat/DXContainerConstants.def"
212+
#define ROOT_ELEMENT_FLAG(Num, Val) IO.mapRequired(#Val, S.Val);
213+
#include "llvm/BinaryFormat/DXContainerConstants.def"
215214
}
216215

217216
void MappingTraits<DXContainerYAML::Part>::mapping(IO &IO,

0 commit comments

Comments
 (0)