nfc: prep dxbc::ComparisonFunc and dxbc::TextureAddressMode

Author: inbelic

llvm/include/llvm/BinaryFormat/DXContainer.h

@@ -231,11 +231,15 @@ enum class TextureAddressMode : uint32_t {
 #include "DXContainerConstants.def"
 };
 
-#define COMPARISON_FUNCTION(Val, Enum) Enum = Val,
-enum class SamplersComparisonFunction : uint32_t {
+LLVM_ABI ArrayRef<EnumEntry<TextureAddressMode>> getTextureAddressModes();
+
+#define COMPARISON_FUNC(Val, Enum) Enum = Val,
+enum class ComparisonFunc : uint32_t {
 #include "DXContainerConstants.def"
 };
 
+LLVM_ABI ArrayRef<EnumEntry<ComparisonFunc>> getComparisonFuncs();
+
 #define STATIC_BORDER_COLOR(Val, Enum) Enum = Val,
 enum class StaticBorderColor : uint32_t {
 #include "DXContainerConstants.def"

llvm/include/llvm/BinaryFormat/DXContainerConstants.def

@@ -188,18 +188,18 @@ TEXTURE_ADDRESS_MODE( 5,  MirrorOnce)
 #undef TEXTURE_ADDRESS_MODE
 #endif // TEXTURE_ADDRESS_MODE
 
-#ifdef COMPARISON_FUNCTION
-
-COMPARISON_FUNCTION( 1,  Never)
-COMPARISON_FUNCTION( 2,  Less)
-COMPARISON_FUNCTION( 3,  Equal)
-COMPARISON_FUNCTION( 4,  LessEqual)
-COMPARISON_FUNCTION( 5,  Greater)
-COMPARISON_FUNCTION( 6,  NotEqual)
-COMPARISON_FUNCTION( 7,  GreaterEqual)
-COMPARISON_FUNCTION( 8,  Always)
-#undef COMPARISON_FUNCTION
-#endif // COMPARISON_FUNCTION
+#ifdef COMPARISON_FUNC
+
+COMPARISON_FUNC( 1,  Never)
+COMPARISON_FUNC( 2,  Less)
+COMPARISON_FUNC( 3,  Equal)
+COMPARISON_FUNC( 4,  LessEqual)
+COMPARISON_FUNC( 5,  Greater)
+COMPARISON_FUNC( 6,  NotEqual)
+COMPARISON_FUNC( 7,  GreaterEqual)
+COMPARISON_FUNC( 8,  Always)
+#undef COMPARISON_FUNC
+#endif // COMPARISON_FUNC
 
 #ifdef STATIC_BORDER_COLOR
 STATIC_BORDER_COLOR( 0,  TransparentBlack)

llvm/include/llvm/ObjectYAML/DXContainerYAML.h

@@ -172,7 +172,7 @@ struct StaticSamplerYamlDesc {
   float MipLODBias = 0.f;
   uint32_t MaxAnisotropy = 16u;
   uint32_t ComparisonFunc =
-      llvm::to_underlying(dxbc::SamplersComparisonFunction::LessEqual);
+      llvm::to_underlying(dxbc::ComparisonFunc::LessEqual);
   uint32_t BorderColor =
       llvm::to_underlying(dxbc::StaticBorderColor::OpaqueWhite);
   float MinLOD = 0.f;

llvm/lib/BinaryFormat/DXContainer.cpp

@@ -99,6 +99,26 @@ ArrayRef<EnumEntry<ShaderVisibility>> dxbc::getShaderVisibility() {
   return ArrayRef(ShaderVisibilityValues);
 }
 
+#define TEXTURE_ADDRESS_MODE(Val, Enum) {#Enum, TextureAddressMode::Enum},
+
+static const EnumEntry<TextureAddressMode> TextureAddressModeNames[] = {
+#include "llvm/BinaryFormat/DXContainerConstants.def"
+};
+
+ArrayRef<EnumEntry<TextureAddressMode>> dxbc::getTextureAddressModes() {
+  return ArrayRef(TextureAddressModeNames);
+}
+
+#define COMPARISON_FUNC(Val, Enum) {#Enum, ComparisonFunc::Enum},
+
+static const EnumEntry<ComparisonFunc> ComparisonFuncNames[] = {
+#include "llvm/BinaryFormat/DXContainerConstants.def"
+};
+
+ArrayRef<EnumEntry<ComparisonFunc>> dxbc::getComparisonFuncs() {
+  return ArrayRef(ComparisonFuncNames);
+}
+
 #define STATIC_BORDER_COLOR(Val, Enum) {#Enum, StaticBorderColor::Enum},
 
 static const EnumEntry<StaticBorderColor> StaticBorderColorValues[] = {