attempt to fix std::out_of_range in GetBindKey

andrejnau · Apr 5, 2021 · ed823d8 · ed823d8
1 parent 0ff0fb2
commit ed823d8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/Core/Shader/ShaderBase.cpp b/src/Core/Shader/ShaderBase.cpp
@@ -56,11 +56,7 @@ uint64_t ShaderBase::GetId(const std::string& entry_point) const
 
 const BindKey& ShaderBase::GetBindKey(const std::string& name) const
 {
-    auto it = m_bind_keys.find(name);
-    if (it != m_bind_keys.end())
-        return it->second;
-    assert(m_blob_type == ShaderBlobType::kSPIRV);
-    return m_bind_keys.at("type." + name);
+    return m_bind_keys.at(name);
 }
 
 const std::vector<ResourceBindingDesc>& ShaderBase::GetResourceBindings() const

diff --git a/src/Core/ShaderReflection/SPIRVReflection.cpp b/src/Core/ShaderReflection/SPIRVReflection.cpp
@@ -236,7 +236,7 @@ ResourceBindingDesc GetBindingDesc(const spirv_cross::CompilerHLSL& compiler, co
 {
     ResourceBindingDesc desc = {};
     decltype(auto) resource_type = compiler.get_type(resource.type_id);
-    desc.name = resource.name;
+    desc.name = compiler.get_name(resource.id);
     desc.type = GetViewType(compiler, resource_type, resource.id);
     desc.slot = compiler.get_decoration(resource.id, spv::DecorationBinding);
     desc.space = compiler.get_decoration(resource.id, spv::DecorationDescriptorSet);

diff --git a/src/Core/ShaderReflection/ShaderReflection.h b/src/Core/ShaderReflection/ShaderReflection.h
@@ -36,6 +36,11 @@ inline bool operator== (const EntryPoint& lhs, const EntryPoint& rhs)
     return std::tie(lhs.name, lhs.kind) == std::tie(rhs.name, rhs.kind);
 }
 
+inline bool operator< (const EntryPoint& lhs, const EntryPoint& rhs)
+{
+    return std::tie(lhs.name, lhs.kind) < std::tie(rhs.name, rhs.kind);
+}
+
 inline auto MakeTie(const ResourceBindingDesc& desc)
 {
     return std::tie(desc.name, desc.type, desc.slot, desc.space, desc.dimension);

diff --git a/src/Core/ShaderReflection/test/main.cpp b/src/Core/ShaderReflection/test/main.cpp
@@ -46,6 +46,8 @@ class RayTracing : public ShaderTestCase
             { "closest", ShaderKind::kClosestHit },
         };
         auto entry_points = reflection->GetEntryPoints();
+        sort(entry_points.begin(), entry_points.end());
+        sort(expect.begin(), expect.end());
         REQUIRE(entry_points.size() == expect.size());
         for (size_t i = 0; i < entry_points.size(); ++i)
         {
@@ -78,6 +80,10 @@ class TrianglePS : public ShaderTestCase
         };
         auto entry_points = reflection->GetEntryPoints();
         REQUIRE(entry_points == expect);
+
+        auto bindings = reflection->GetBindings();
+        REQUIRE(bindings.size() == 1);
+        REQUIRE(bindings.front().name == "Settings");
     }
 
 private: