clean up

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -14,11 +14,9 @@
 #define LLVM_BINARYFORMAT_DXCONTAINER_H
 
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/SwapByteOrder.h"
 #include "llvm/TargetParser/Triple.h"
 
-#include <cstdint>
 #include <stdint.h>
 
 namespace llvm {
@@ -579,7 +577,7 @@ struct RootConstants {
 struct RootParameter {
   dxbc::RootParameterType ParameterType;
   union {
-    RootConstants Constants;
+    dxbc::RootConstants Constants;
   };
   dxbc::ShaderVisibilityFlag ShaderVisibility;
 
@@ -594,7 +592,6 @@ struct RootParameter {
     sys::swapByteOrder(ParameterType);
     sys::swapByteOrder(ShaderVisibility);
     switch (ParameterType) {
-
     case RootParameterType::Constants32Bit:
       Constants.swapBytes();
       break;

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

@@ -76,11 +76,11 @@ ROOT_ELEMENT_FLAG(11, SamplerHeapDirectlyIndexed)
 
 ROOT_PARAMETER(1, Constants32Bit)
 ROOT_PARAMETER(5, Empty)
-
 #undef ROOT_PARAMETER
 #endif // ROOT_PARAMETER
 
 #ifdef SHADER_VISIBILITY
+
 SHADER_VISIBILITY(0, All)
 SHADER_VISIBILITY(1, Vertex)
 SHADER_VISIBILITY(2, Hull)

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -15,7 +15,6 @@ namespace llvm {
 class raw_ostream;
 
 namespace mcdxbc {
-
 struct RootSignatureDesc {
   dxbc::RootSignatureHeader Header;
   SmallVector<dxbc::RootParameter> Parameters;

llvm/include/llvm/Object/DXContainer.h

@@ -22,7 +22,6 @@
 #include "llvm/Support/MemoryBufferRef.h"
 #include "llvm/TargetParser/Triple.h"
 #include <array>
-#include <cstdint>
 #include <variant>
 
 namespace llvm {

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -7,27 +7,27 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/DXContainerRootSignature.h"
-#include "llvm/ADT/bit.h"
 #include "llvm/BinaryFormat/DXContainer.h"
 #include "llvm/Support/EndianStream.h"
-#include "llvm/Support/ErrorHandling.h"
 #include <cstdint>
-#include <sys/types.h>
 
 using namespace llvm;
 using namespace llvm::mcdxbc;
 
 void RootSignatureDesc::write(raw_ostream &OS) const {
+  // Root signature header in dxcontainer has 6 uint_32t values.
   const uint32_t HeaderSize = 24;
   const uint32_t ParameterByteSize = Parameters.size_in_bytes();
+  const uint32_t NumParametes = Parameters.size();
+  const uint32_t Zero = 0;
 
   // Writing header information
   support::endian::write(OS, Header.Version, llvm::endianness::little);
-  support::endian::write(OS, (uint32_t)Parameters.size(),
-                         llvm::endianness::little);
+  support::endian::write(OS, NumParametes, llvm::endianness::little);
   support::endian::write(OS, HeaderSize, llvm::endianness::little);
-  support::endian::write(OS, ((uint32_t)0), llvm::endianness::little);
-  // TODO: this value means nothing right now...
+
+  // Static samplers still not implemented
+  support::endian::write(OS, Zero, llvm::endianness::little);
   support::endian::write(OS, ParameterByteSize + HeaderSize,
                          llvm::endianness::little);
 

llvm/lib/Object/DXContainer.cpp

@@ -11,10 +11,7 @@
 #include "llvm/Object/Error.h"
 #include "llvm/Support/Alignment.h"
 #include "llvm/Support/Endian.h"
-#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormatVariadic.h"
-#include <cstddef>
-#include <cstdint>
 
 using namespace llvm;
 using namespace llvm::object;
@@ -331,7 +328,6 @@ Error DirectX::RootSignature::parse(StringRef Data) {
     } break;
     case dxbc::RootParameterType::Empty:
       llvm_unreachable("Invalid value for RootParameterType");
-      break;
     }
 
     Parameters.push_back(NewParam);

llvm/lib/ObjectYAML/DXContainerEmitter.cpp

@@ -19,7 +19,6 @@
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/raw_ostream.h"
-#include <utility>
 
 using namespace llvm;
 

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -14,7 +14,6 @@
 #include "llvm/ObjectYAML/DXContainerYAML.h"
 #include "llvm/ADT/ScopeExit.h"
 #include "llvm/BinaryFormat/DXContainer.h"
-#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/ScopedPrinter.h"
 
 namespace llvm {
@@ -232,14 +231,11 @@ void MappingTraits<dxbc::RootParameter>::mapping(IO &IO,
   IO.mapRequired("ParameterType", P.ParameterType);
   IO.mapRequired("ShaderVisibility", P.ShaderVisibility);
   switch (P.ParameterType) {
-
   case dxbc::RootParameterType::Constants32Bit:
     IO.mapRequired("Constants", P.Constants);
-
     break;
   case dxbc::RootParameterType::Empty:
     llvm_unreachable("Invalid value for ParameterType");
-    break;
   }
 }
 

llvm/unittests/Object/DXContainerTest.cpp

@@ -14,7 +14,6 @@
 #include "llvm/Support/MemoryBufferRef.h"
 #include "llvm/Testing/Support/Error.h"
 #include "gtest/gtest.h"
-#include <cstdint>
 
 using namespace llvm;
 using namespace llvm::object;