moving it to SPIRVShaderResourceAttribs, make it static member ResourceTypeToString

Author: hzqst

Graphics/ShaderTools/include/SPIRVShaderResources.hpp

@@ -85,6 +85,7 @@ struct SPIRVShaderResourceAttribs
 
     static SHADER_RESOURCE_TYPE    GetShaderResourceType(ResourceType Type);
     static PIPELINE_RESOURCE_FLAGS GetPipelineResourceFlags(ResourceType Type);
+    static const char*             ResourceTypeToString(ResourceType Type);
 
     // clang-format off
 

Graphics/ShaderTools/src/SPIRVShaderResources.cpp

@@ -248,6 +248,41 @@ PIPELINE_RESOURCE_FLAGS SPIRVShaderResourceAttribs::GetPipelineResourceFlags(Res
     }
 }
 
+const char* SPIRVShaderResourceAttribs::ResourceTypeToString(SPIRVShaderResourceAttribs::ResourceType Type)
+{
+    switch (Type)
+    {
+        case SPIRVShaderResourceAttribs::ResourceType::UniformBuffer:
+            return "UniformBuffer";
+        case SPIRVShaderResourceAttribs::ResourceType::ROStorageBuffer:
+            return "ROStorageBuffer";
+        case SPIRVShaderResourceAttribs::ResourceType::RWStorageBuffer:
+            return "RWStorageBuffer";
+        case SPIRVShaderResourceAttribs::ResourceType::UniformTexelBuffer:
+            return "UniformTexelBuffer";
+        case SPIRVShaderResourceAttribs::ResourceType::StorageTexelBuffer:
+            return "StorageTexelBuffer";
+        case SPIRVShaderResourceAttribs::ResourceType::StorageImage:
+            return "StorageImage";
+        case SPIRVShaderResourceAttribs::ResourceType::SampledImage:
+            return "SampledImage";
+        case SPIRVShaderResourceAttribs::ResourceType::AtomicCounter:
+            return "AtomicCounter";
+        case SPIRVShaderResourceAttribs::ResourceType::SeparateImage:
+            return "SeparateImage";
+        case SPIRVShaderResourceAttribs::ResourceType::SeparateSampler:
+            return "SeparateSampler";
+        case SPIRVShaderResourceAttribs::ResourceType::InputAttachment:
+            return "InputAttachment";
+        case SPIRVShaderResourceAttribs::ResourceType::AccelerationStructure:
+            return "AccelerationStructure";
+        case SPIRVShaderResourceAttribs::ResourceType::PushConstant:
+            return "PushConstant";
+        default:
+            return "Unknown";
+    }
+}
+
 spv::ExecutionModel ShaderTypeToSpvExecutionModel(SHADER_TYPE ShaderType)
 {
     static_assert(SHADER_TYPE_LAST == 0x4000, "Please handle the new shader type in the switch below");

Tests/DiligentCoreTest/src/ShaderTools/SPIRVShaderResourcesTest.cpp

@@ -42,41 +42,6 @@ using namespace Diligent::Testing;
 namespace
 {
 
-const char* SPIRVShaderResourceTypeToString(SPIRVShaderResourceAttribs::ResourceType Type)
-{
-    switch (Type)
-    {
-        case SPIRVShaderResourceAttribs::ResourceType::UniformBuffer:
-            return "UniformBuffer";
-        case SPIRVShaderResourceAttribs::ResourceType::ROStorageBuffer:
-            return "ROStorageBuffer";
-        case SPIRVShaderResourceAttribs::ResourceType::RWStorageBuffer:
-            return "RWStorageBuffer";
-        case SPIRVShaderResourceAttribs::ResourceType::UniformTexelBuffer:
-            return "UniformTexelBuffer";
-        case SPIRVShaderResourceAttribs::ResourceType::StorageTexelBuffer:
-            return "StorageTexelBuffer";
-        case SPIRVShaderResourceAttribs::ResourceType::StorageImage:
-            return "StorageImage";
-        case SPIRVShaderResourceAttribs::ResourceType::SampledImage:
-            return "SampledImage";
-        case SPIRVShaderResourceAttribs::ResourceType::AtomicCounter:
-            return "AtomicCounter";
-        case SPIRVShaderResourceAttribs::ResourceType::SeparateImage:
-            return "SeparateImage";
-        case SPIRVShaderResourceAttribs::ResourceType::SeparateSampler:
-            return "SeparateSampler";
-        case SPIRVShaderResourceAttribs::ResourceType::InputAttachment:
-            return "InputAttachment";
-        case SPIRVShaderResourceAttribs::ResourceType::AccelerationStructure:
-            return "AccelerationStructure";
-        case SPIRVShaderResourceAttribs::ResourceType::PushConstant:
-            return "PushConstant";
-        default:
-            return "Unknown";
-    }
-}
-
 std::vector<uint32_t> HLSLtoSPIRV(const char* FilePath, SHADER_TYPE ShaderType = SHADER_TYPE_PIXEL)
 {
     ShaderCreateInfo ShaderCI;
@@ -190,7 +155,7 @@ void TestSPIRVResources(const char*                                    FilePath,
         ASSERT_NE(pRefRes, nullptr) << "Resource '" << Res.Name << "' is not found in the reference list";
 
         EXPECT_EQ(Res.ArraySize, pRefRes->ArraySize) << Res.Name;
-        EXPECT_STREQ(SPIRVShaderResourceTypeToString(Res.Type), SPIRVShaderResourceTypeToString(pRefRes->Type)) << Res.Name;
+        EXPECT_STREQ(SPIRVShaderResourceAttribs::ResourceTypeToString(Res.Type), SPIRVShaderResourceAttribs::ResourceTypeToString(pRefRes->Type)) << Res.Name;
         EXPECT_EQ(Res.ArraySize, pRefRes->ArraySize) << Res.Name;
         EXPECT_EQ(Res.ResourceDim, pRefRes->ResourceDim) << Res.Name;
         EXPECT_EQ(Res.IsMS, pRefRes->IsMS) << Res.Name;