zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: check if name for constant or texture def was already added

Browse Source
This commit is contained in:
Jan 2024-02-24 11:53:34 +01:00
parent 5bbab8ca79
commit 6b6fd7cb10
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ObjWriting/Game/T6/AssetDumpers/AssetDumperMaterial.cpp
View File

@ -133,36 +133,52 @@ namespace T6::material
if (globalsConstantBuffer != shaderInfo->m_constant_buffers.end()) if (globalsConstantBuffer != shaderInfo->m_constant_buffers.end())
{ {
for (const auto& variable : globalsConstantBuffer->m_variables) for (const auto& variable : globalsConstantBuffer->m_variables)
{ AddConstantName(variable.m_name);
m_constant_names_from_shaders.emplace(Common::R_HashString(variable.m_name.c_str(), 0), variable.m_name);
}
} }
if (perObjectConsts != shaderInfo->m_constant_buffers.end()) if (perObjectConsts != shaderInfo->m_constant_buffers.end())
{ {
for (const auto& variable : perObjectConsts->m_variables) for (const auto& variable : perObjectConsts->m_variables)
{ AddConstantName(variable.m_name);
m_constant_names_from_shaders.emplace(Common::R_HashString(variable.m_name.c_str(), 0), variable.m_name);
}
} }
for (const auto& boundResource : shaderInfo->m_bound_resources) for (const auto& boundResource : shaderInfo->m_bound_resources)
{ {
if (boundResource.m_type == d3d11::BoundResourceType::SAMPLER || boundResource.m_type == d3d11::BoundResourceType::TEXTURE) if (boundResource.m_type == d3d11::BoundResourceType::SAMPLER || boundResource.m_type == d3d11::BoundResourceType::TEXTURE)
{ {
m_texture_def_names_from_shaders.emplace(Common::R_HashString(boundResource.m_name.c_str(), 0), boundResource.m_name); if (AddTextureDefName(boundResource.m_name))
const auto samplerPos = boundResource.m_name.rfind(SAMPLER_STR);
if (samplerPos != std::string::npos)
{ {
auto nameWithoutSamplerStr = boundResource.m_name; const auto samplerPos = boundResource.m_name.rfind(SAMPLER_STR);
nameWithoutSamplerStr.erase(samplerPos, std::char_traits<char>::length(SAMPLER_STR)); if (samplerPos != std::string::npos)
m_texture_def_names_from_shaders.emplace(Common::R_HashString(nameWithoutSamplerStr.c_str(), 0), nameWithoutSamplerStr); {
auto nameWithoutSamplerStr = boundResource.m_name;
nameWithoutSamplerStr.erase(samplerPos, std::char_traits<char>::length(SAMPLER_STR));
AddTextureDefName(std::move(nameWithoutSamplerStr));
}
} }
} }
} }
} }
void AddConstantName(std::string constantName)
{
const auto hash = Common::R_HashString(constantName.c_str(), 0);
if (m_constant_names_from_shaders.find(hash) != m_constant_names_from_shaders.end())
return;
m_constant_names_from_shaders.emplace(hash, std::move(constantName));
}
bool AddTextureDefName(std::string textureDefName)
{
const auto hash = Common::R_HashString(textureDefName.c_str(), 0);
if (m_texture_def_names_from_shaders.find(hash) != m_texture_def_names_from_shaders.end())
return false;
m_texture_def_names_from_shaders.emplace(hash, std::move(textureDefName));
return true;
}
std::unordered_set<const MaterialTechnique*> m_dumped_techniques; std::unordered_set<const MaterialTechnique*> m_dumped_techniques;
std::unordered_map<unsigned, std::string> m_constant_names_from_shaders; std::unordered_map<unsigned, std::string> m_constant_names_from_shaders;
std::unordered_map<unsigned, std::string> m_texture_def_names_from_shaders; std::unordered_map<unsigned, std::string> m_texture_def_names_from_shaders;