ac

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -55,7 +55,7 @@ enum class HashFlags : uint32_t {
 };
 
 struct ShaderHash {
-  uint32_t Flags; // dxbc::HashFlags
+  uint32_t Flags; // HashFlags
   uint8_t Digest[16];
 
   bool isPopulated();
@@ -573,8 +573,8 @@ struct RootConstants {
 };
 
 struct RootParameterHeader {
-  dxbc::RootParameterType ParameterType;
-  dxbc::ShaderVisibility ShaderVisibility;
+  RootParameterType ParameterType;
+  ShaderVisibility ShaderVisibility;
   uint32_t ParameterOffset;
 
   void swapBytes() {

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -32,19 +32,7 @@ struct RootSignatureDesc {
 
   void write(raw_ostream &OS) const;
 
-  size_t getSize() const {
-    size_t size = sizeof(dxbc::RootSignatureHeader);
-
-    for (const auto &P : Parameters) {
-      switch (P.Header.ParameterType) {
-
-      case dxbc::RootParameterType::Constants32Bit:
-        size += sizeof(dxbc::RootConstants);
-        break;
-      }
-    }
-    return size;
-  }
+  size_t getSize() const;
 };
 } // namespace mcdxbc
 } // namespace llvm

llvm/include/llvm/Object/DXContainer.h

@@ -138,7 +138,7 @@ struct RootParameterView {
 
   template <typename T> Expected<T> readParameter() {
     T Struct;
-    if (sizeof(T) > ParamData.size())
+    if (sizeof(T) != ParamData.size())
       return make_error<GenericBinaryError>(
           "Reading structure out of file bounds", object_error::parse_failed);
 

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -86,8 +86,6 @@ struct RootParameterYamlDesc {
   dxbc::ShaderVisibility Visibility;
   uint32_t Offset;
 
-  RootParameterYamlDesc() = default;
-
   union {
     RootConstantsYaml Constants;
   };

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -29,6 +29,20 @@ static void rewriteOffsetToCurrentByte(raw_svector_ostream &Stream,
   Stream.pwrite(reinterpret_cast<const char *>(&Value), sizeof(Value), Offset);
 }
 
+size_t RootSignatureDesc::getSize() const {
+  size_t Size = sizeof(dxbc::RootSignatureHeader);
+
+  for (const auto &P : Parameters) {
+    Size += sizeof(P.Header);
+    switch (P.Header.ParameterType) {
+    case dxbc::RootParameterType::Constants32Bit:
+      Size += sizeof(dxbc::RootConstants);
+      break;
+    }
+  }
+  return Size;
+}
+
 void RootSignatureDesc::write(raw_ostream &OS) const {
   SmallString<256> Storage;
   raw_svector_ostream BOS(Storage);
@@ -38,11 +52,8 @@ void RootSignatureDesc::write(raw_ostream &OS) const {
 
   support::endian::write(BOS, Header.Version, llvm::endianness::little);
   support::endian::write(BOS, NumParameters, llvm::endianness::little);
-
-  // Root Parameters offset should always start after the
   support::endian::write(BOS, (uint32_t)sizeof(dxbc::RootSignatureHeader),
                          llvm::endianness::little);
-
   support::endian::write(BOS, Zero, llvm::endianness::little);
   support::endian::write(BOS, Zero, llvm::endianness::little);
   support::endian::write(BOS, Header.Flags, llvm::endianness::little);

llvm/lib/Object/DXContainer.cpp

@@ -287,7 +287,7 @@ Error DirectX::RootSignature::parse(StringRef Data) {
   ParameterSpaceOffset =
       RootParametersOffset + NumParameters * sizeof(dxbc::RootParameterHeader);
   size_t ParameterSpaceEnd =
-      Data.size() - ((NumStaticSamplers == 0) ? 0 : StaticSamplersOffset);
+      (NumStaticSamplers == 0) ? Data.size() : StaticSamplersOffset;
 
   ParameterSpace = Data.substr(ParameterSpaceOffset,
                                ParameterSpaceEnd - ParameterSpaceOffset);

llvm/lib/ObjectYAML/DXContainerYAML.cpp

@@ -40,7 +40,7 @@ DXContainerYAML::RootSignatureYamlDesc::RootSignatureYamlDesc(
   uint32_t Flags = Data.getFlags();
   for (const auto &PH : Data.param_header()) {
 
-    auto NewP = RootParameterYamlDesc();
+    RootParameterYamlDesc NewP;
     NewP.Offset = PH.ParameterOffset;
     NewP.Type = PH.ParameterType;
     NewP.Visibility = PH.ShaderVisibility;