clean up

Author: joaosaffran

llvm/include/llvm/Frontend/HLSL/RootSignatureMetadata.h

@@ -51,19 +51,19 @@ class RootSignatureValidationError
 class OffsetOverflowError : public ErrorInfo<OffsetOverflowError> {
 public:
   static char ID;
-  dxbc::DescriptorRangeType Type;
+  dxil::ResourceClass Type;
   uint32_t Register;
   uint32_t Space;
 
-  OffsetOverflowError(dxbc::DescriptorRangeType Type, uint32_t Register,
+  OffsetOverflowError(dxil::ResourceClass Type, uint32_t Register,
                       uint32_t Space)
       : Type(Type), Register(Register), Space(Space) {}
 
   void log(raw_ostream &OS) const override {
     OS << "Cannot append range with implicit lower bound after an unbounded "
           "range "
-       << getResourceClassName(toResourceClass(Type))
-       << "(register=" << Register << ", space=" << Space << ").";
+       << getResourceClassName(Type) << "(register=" << Register
+       << ", space=" << Space << ").";
   }
 
   std::error_code convertToErrorCode() const override {
@@ -75,17 +75,16 @@ class ShaderRegisterOverflowError
     : public ErrorInfo<ShaderRegisterOverflowError> {
 public:
   static char ID;
-  dxbc::DescriptorRangeType Type;
+  dxil::ResourceClass Type;
   uint32_t Register;
   uint32_t Space;
 
-  ShaderRegisterOverflowError(dxbc::DescriptorRangeType Type, uint32_t Register,
+  ShaderRegisterOverflowError(dxil::ResourceClass Type, uint32_t Register,
                               uint32_t Space)
       : Type(Type), Register(Register), Space(Space) {}
 
   void log(raw_ostream &OS) const override {
-    OS << "Overflow for shader register range: "
-       << getResourceClassName(toResourceClass(Type))
+    OS << "Overflow for shader register range: " << getResourceClassName(Type)
        << "(register=" << Register << ", space=" << Space << ").";
   }
 
@@ -98,17 +97,16 @@ class DescriptorRangeOverflowError
     : public ErrorInfo<DescriptorRangeOverflowError> {
 public:
   static char ID;
-  dxbc::DescriptorRangeType Type;
+  dxil::ResourceClass Type;
   uint32_t Register;
   uint32_t Space;
 
-  DescriptorRangeOverflowError(dxbc::DescriptorRangeType Type,
-                               uint32_t Register, uint32_t Space)
+  DescriptorRangeOverflowError(dxil::ResourceClass Type, uint32_t Register,
+                               uint32_t Space)
       : Type(Type), Register(Register), Space(Space) {}
 
   void log(raw_ostream &OS) const override {
-    OS << "Overflow for descriptor range: "
-       << getResourceClassName(toResourceClass(Type))
+    OS << "Overflow for descriptor range: " << getResourceClassName(Type)
        << "(register=" << Register << ", space=" << Space << ").";
   }
 
@@ -120,16 +118,15 @@ class DescriptorRangeOverflowError
 class TableSamplerMixinError : public ErrorInfo<TableSamplerMixinError> {
 public:
   static char ID;
-  dxbc::DescriptorRangeType Type;
+  dxil::ResourceClass Type;
   uint32_t Location;
 
-  TableSamplerMixinError(dxbc::DescriptorRangeType Type, uint32_t Location)
+  TableSamplerMixinError(dxil::ResourceClass Type, uint32_t Location)
       : Type(Type), Location(Location) {}
 
   void log(raw_ostream &OS) const override {
     OS << "Samplers cannot be mixed with other "
-       << "resource types in a descriptor table, "
-       << getResourceClassName(toResourceClass(Type))
+       << "resource types in a descriptor table, " << getResourceClassName(Type)
        << "(location=" << Location << ")";
   }
 

llvm/lib/Frontend/HLSL/RootSignatureMetadata.cpp

@@ -540,7 +540,8 @@ Error validateDescriptorTableSamplerMixin(mcdxbc::DescriptorTable Table,
 
   // Samplers cannot be mixed with other resources in a descriptor table.
   if (HasSampler && HasOtherRangeType)
-    return make_error<TableSamplerMixinError>(OtherRangeType, Location);
+    return make_error<TableSamplerMixinError>(toResourceClass(OtherRangeType),
+                                              Location);
   return Error::success();
 }
 
@@ -556,16 +557,19 @@ Error validateDescriptorTableRegisterOverflow(mcdxbc::DescriptorTable Table,
       AppendingRegister = Range.OffsetInDescriptorsFromTableStart;
 
     if (verifyOffsetOverflow(AppendingRegister))
-      return make_error<OffsetOverflowError>(
-          RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
+      return make_error<OffsetOverflowError>(dxbc::toResourceClass(RangeType),
+                                             Range.BaseShaderRegister,
+                                             Range.RegisterSpace);
 
     if (verifyRegisterOverflow(Range.BaseShaderRegister, Range.NumDescriptors))
       return make_error<ShaderRegisterOverflowError>(
-          RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
+          dxbc::toResourceClass(RangeType), Range.BaseShaderRegister,
+          Range.RegisterSpace);
 
     if (verifyRegisterOverflow(AppendingRegister, Range.NumDescriptors))
       return make_error<DescriptorRangeOverflowError>(
-          RangeType, Range.BaseShaderRegister, Range.RegisterSpace);
+          dxbc::toResourceClass(RangeType), Range.BaseShaderRegister,
+          Range.RegisterSpace);
 
     AppendingRegister =
         updateAppendingRegister(AppendingRegister, Range.NumDescriptors,