adding root constants

Author: joaosaffran

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -159,6 +159,20 @@ enum class RootElementFlag : uint32_t {
 #include "DXContainerConstants.def"
 };
 
+#define ROOT_PARAMETER(Val, Enum) Enum = Val,
+enum class RootParameterType : uint8_t {
+#include "DXContainerConstants.def"
+};
+
+ArrayRef<EnumEntry<RootParameterType>> getRootParameterTypes();
+
+#define SHADER_VISIBILITY(Val, Enum) Enum = Val,
+enum class ShaderVisibilityFlag : uint8_t {
+#include "DXContainerConstants.def"
+};
+
+ArrayRef<EnumEntry<ShaderVisibilityFlag>> getShaderVisibilityFlags();
+
 PartType parsePartType(StringRef S);
 
 struct VertexPSVInfo {

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

@@ -72,6 +72,23 @@ ROOT_ELEMENT_FLAG(11, SamplerHeapDirectlyIndexed)
 #undef ROOT_ELEMENT_FLAG
 #endif // ROOT_ELEMENT_FLAG
 
+#ifdef ROOT_PARAMETER
+
+ROOT_PARAMETER(1, Constants32Bit)
+#undef ROOT_PARAMETER
+#endif // ROOT_PARAMETER
+
+#ifdef SHADER_VISIBILITY
+SHADER_VISIBILITY(0, All)
+SHADER_VISIBILITY(1, Vertex)
+SHADER_VISIBILITY(2, Hull)
+SHADER_VISIBILITY(3, Domain)
+SHADER_VISIBILITY(4, Geometry)
+SHADER_VISIBILITY(5, Pixel)
+SHADER_VISIBILITY(6, Amplification)
+SHADER_VISIBILITY(7, Mesh)
+#undef SHADER_VISIBILITY
+#endif // SHADER_VISIBILITY
 
 #ifdef DXIL_MODULE_FLAG
 

llvm/include/llvm/MC/DXContainerRootSignature.h

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/BinaryFormat/DXContainer.h"
 #include <cstdint>
 #include <limits>
 
@@ -14,6 +15,9 @@ namespace llvm {
 class raw_ostream;
 
 namespace mcdxbc {
+
+
+
 struct RootSignatureHeader {
   uint32_t Version = 2;
   uint32_t NumParameters = 0;
@@ -24,5 +28,23 @@ struct RootSignatureHeader {
 
   void write(raw_ostream &OS);
 };
+
+struct RootConstants {
+  uint32_t ShaderRegister;
+  uint32_t RegisterSpace;
+  uint32_t Num32BitValues;
+
+  void write(raw_ostream &OS);
+};
+
+struct RootParameter {
+  dxbc::RootParameterType ParameterType;
+  union {
+    RootConstants Constants;
+  };
+  dxbc::ShaderVisibilityFlag ShaderVisibility;
+
+  void write(raw_ostream &OS);
+}; 
 } // namespace mcdxbc
 } // namespace llvm

llvm/lib/MC/DXContainerRootSignature.cpp

@@ -7,17 +7,34 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/DXContainerRootSignature.h"
+#include "llvm/ADT/bit.h"
 #include "llvm/Support/EndianStream.h"
 
 using namespace llvm;
 using namespace llvm::mcdxbc;
 
 void RootSignatureHeader::write(raw_ostream &OS) {
-
   support::endian::write(OS, Version, llvm::endianness::little);
   support::endian::write(OS, NumParameters, llvm::endianness::little);
   support::endian::write(OS, RootParametersOffset, llvm::endianness::little);
   support::endian::write(OS, NumStaticSamplers, llvm::endianness::little);
   support::endian::write(OS, StaticSamplersOffset, llvm::endianness::little);
   support::endian::write(OS, Flags, llvm::endianness::little);
 }
+
+void RootParameter::write(raw_ostream &OS) {
+  support::endian::write(OS, ParameterType, llvm::endianness::little);
+  support::endian::write(OS, ShaderVisibility, llvm::endianness::little);
+
+  switch(ParameterType){
+  case dxbc::RootParameterType::Constants32Bit:
+    Constants.write(OS);
+    break;
+  }
+}
+
+void RootConstants::write(raw_ostream &OS) {
+  support::endian::write(OS, Num32BitValues, llvm::endianness::little);
+  support::endian::write(OS, RegisterSpace, llvm::endianness::little);
+  support::endian::write(OS, ShaderRegister, llvm::endianness::little);
+}