format

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -66,7 +66,6 @@ struct ShaderHash {
   void swapBytes() { sys::swapByteOrder(Flags); }
 };
 
-
 struct ContainerVersion {
   uint16_t Major;
   uint16_t Minor;
@@ -552,17 +551,17 @@ static_assert(sizeof(ProgramSignatureElement) == 32,
 
 struct RootSignatureValidations {
 
-    static Expected<uint32_t> validateRootFlag(uint32_t Flags) {
-      if ((Flags & ~0x80000fff) != 0)
-        return llvm::make_error<object::GenericBinaryError>("Invalid flag");
-      return Flags;
-    }
+  static Expected<uint32_t> validateRootFlag(uint32_t Flags) {
+    if ((Flags & ~0x80000fff) != 0)
+      return llvm::make_error<object::GenericBinaryError>("Invalid flag");
+    return Flags;
+  }
 
-    static Expected<uint32_t> validateVersion(uint32_t Version) {
-      if (Version < 1 || Version > 2)
-        return llvm::make_error<object::GenericBinaryError>("Invalid Version");
-      return Version;
-    }
+  static Expected<uint32_t> validateVersion(uint32_t Version) {
+    if (Version < 1 || Version > 2)
+      return llvm::make_error<object::GenericBinaryError>("Invalid Version");
+    return Version;
+  }
 };
 
 } // namespace dxbc

llvm/lib/Object/DXContainer.cpp

@@ -248,17 +248,18 @@ void DXContainer::PartIterator::updateIteratorImpl(const uint32_t Offset) {
 Error DirectX::RootSignature::parse(StringRef Data) {
   const char *Current = Data.begin();
 
-
   // Root Signature headers expects 6 integers to be present.
   if (Data.size() < 6 * sizeof(uint32_t)) {
     return parseFailed("Invalid data. Too small.");
   }
 
-  uint32_t VValue = support::endian::read<uint32_t, llvm::endianness::little>(Current);
+  uint32_t VValue =
+      support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 
-  Expected<uint32_t> MaybeVersion = dxbc::RootSignatureValidations::validateVersion(VValue);
-  if(Error E = MaybeVersion.takeError())
+  Expected<uint32_t> MaybeVersion =
+      dxbc::RootSignatureValidations::validateVersion(VValue);
+  if (Error E = MaybeVersion.takeError())
     return E;
   Version = MaybeVersion.get();
 
@@ -278,11 +279,13 @@ Error DirectX::RootSignature::parse(StringRef Data) {
       support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 
-  uint32_t FValue = support::endian::read<uint32_t, llvm::endianness::little>(Current);
+  uint32_t FValue =
+      support::endian::read<uint32_t, llvm::endianness::little>(Current);
   Current += sizeof(uint32_t);
 
-  Expected<uint32_t> MaybeFlag = dxbc::RootSignatureValidations::validateRootFlag(FValue);
-  if(Error E = MaybeFlag.takeError())
+  Expected<uint32_t> MaybeFlag =
+      dxbc::RootSignatureValidations::validateRootFlag(FValue);
+  if (Error E = MaybeFlag.takeError())
     return E;
   Flags = MaybeFlag.get();
 

llvm/unittests/Object/DXContainerTest.cpp

@@ -868,7 +868,7 @@ TEST(RootSignature, ParseRootFlags) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
     };
-        EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
+    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
                          FailedWithMessage("Invalid Version"));
   }
   {
@@ -881,7 +881,7 @@ TEST(RootSignature, ParseRootFlags) {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xFF,
     };
-        EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
+    EXPECT_THAT_EXPECTED(DXContainer::create(getMemoryBuffer<68>(Buffer)),
                          FailedWithMessage("Invalid flag"));
   }
 }