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

Remember which vertex shader and pixel shader args have been handled already

Browse Source
This commit is contained in:
Jan 2022-04-11 20:06:02 +02:00
parent 99c7ebbe9b
commit 3ba68eb2f4
1 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/ObjLoading/Game/IW4/AssetLoaders/AssetLoaderTechniqueSet.cpp
View File

@ -86,9 +86,11 @@ namespace IW4
{ {
XAssetInfo<MaterialVertexShader>* m_vertex_shader; XAssetInfo<MaterialVertexShader>* m_vertex_shader;
std::unique_ptr<d3d9::ShaderInfo> m_vertex_shader_info; std::unique_ptr<d3d9::ShaderInfo> m_vertex_shader_info;
std::vector<bool> m_handled_vertex_shader_arguments;
XAssetInfo<MaterialPixelShader>* m_pixel_shader; XAssetInfo<MaterialPixelShader>* m_pixel_shader;
std::unique_ptr<d3d9::ShaderInfo> m_pixel_shader_info; std::unique_ptr<d3d9::ShaderInfo> m_pixel_shader_info;
std::vector<bool> m_handled_pixel_shader_arguments;
MaterialVertexDeclaration m_vertex_decl; MaterialVertexDeclaration m_vertex_decl;
XAssetInfo<MaterialVertexDeclaration>* m_vertex_decl_asset; XAssetInfo<MaterialVertexDeclaration>* m_vertex_decl_asset;
@ -120,11 +122,33 @@ namespace IW4
bool AutoCreateVertexShaderArguments(std::string& string) bool AutoCreateVertexShaderArguments(std::string& string)
{ {
assert(!m_passes.empty());
auto& pass = m_passes.at(m_passes.size() - 1);
for (auto i = 0u; i < pass.m_handled_vertex_shader_arguments.size(); i++)
{
if (!pass.m_handled_vertex_shader_arguments[i])
{
std::cout << "Unhandled vertex shader \"" << pass.m_vertex_shader->m_name << "\" arg: " << pass.m_vertex_shader_info->m_constants[i].m_name << "\n";
}
}
return true; return true;
} }
bool AutoCreatePixelShaderArguments(std::string& string) bool AutoCreatePixelShaderArguments(std::string& string)
{ {
assert(!m_passes.empty());
auto& pass = m_passes.at(m_passes.size() - 1);
for (auto i = 0u; i < pass.m_handled_pixel_shader_arguments.size(); i++)
{
if (!pass.m_handled_pixel_shader_arguments[i])
{
std::cout << "Unhandled pixel shader \"" << pass.m_pixel_shader->m_name << "\" arg: " << pass.m_pixel_shader_info->m_constants[i].m_name << "\n";
}
}
return true; return true;
} }
@ -183,6 +207,13 @@ namespace IW4
const auto& shaderLoadDef = pass.m_vertex_shader->Asset()->prog.loadDef; const auto& shaderLoadDef = pass.m_vertex_shader->Asset()->prog.loadDef;
pass.m_vertex_shader_info = d3d9::ShaderAnalyser::GetShaderInfo(shaderLoadDef.program, shaderLoadDef.programSize * sizeof(uint32_t)); pass.m_vertex_shader_info = d3d9::ShaderAnalyser::GetShaderInfo(shaderLoadDef.program, shaderLoadDef.programSize * sizeof(uint32_t));
if (!pass.m_vertex_shader_info)
{
errorMessage = "No shader info for shader";
return false;
}
pass.m_handled_vertex_shader_arguments.resize(pass.m_vertex_shader_info->m_constants.size());
return true; return true;
} }
@ -202,6 +233,13 @@ namespace IW4
const auto& shaderLoadDef = pass.m_pixel_shader->Asset()->prog.loadDef; const auto& shaderLoadDef = pass.m_pixel_shader->Asset()->prog.loadDef;
pass.m_pixel_shader_info = d3d9::ShaderAnalyser::GetShaderInfo(shaderLoadDef.program, shaderLoadDef.programSize * sizeof(uint32_t)); pass.m_pixel_shader_info = d3d9::ShaderAnalyser::GetShaderInfo(shaderLoadDef.program, shaderLoadDef.programSize * sizeof(uint32_t));
if (!pass.m_pixel_shader_info)
{
errorMessage = "No shader info for shader";
return false;
}
pass.m_handled_pixel_shader_arguments.resize(pass.m_pixel_shader_info->m_constants.size());
return true; return true;
} }
@ -291,6 +329,7 @@ namespace IW4
return false; return false;
} }
const auto shaderConstantIndex = static_cast<size_t>(matchingShaderConstant - shaderInfo.m_constants.begin());
const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant); const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant);
if (argumentIsSampler) if (argumentIsSampler)
{ {
@ -341,6 +380,7 @@ namespace IW4
argument.u.codeConst.rowCount = static_cast<unsigned char>(matchingShaderConstant->m_type_rows); argument.u.codeConst.rowCount = static_cast<unsigned char>(matchingShaderConstant->m_type_rows);
pass.m_arguments.push_back(argument); pass.m_arguments.push_back(argument);
pass.m_handled_vertex_shader_arguments[shaderConstantIndex] = true;
return true; return true;
} }
@ -369,6 +409,7 @@ namespace IW4
return false; return false;
} }
const auto shaderConstantIndex = static_cast<size_t>(matchingShaderConstant - shaderInfo.m_constants.begin());
const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant); const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant);
if (argumentIsSampler && !isSampler) if (argumentIsSampler && !isSampler)
{ {
@ -446,6 +487,7 @@ namespace IW4
argument.u.codeConst.rowCount = static_cast<unsigned char>(matchingShaderConstant->m_type_rows); argument.u.codeConst.rowCount = static_cast<unsigned char>(matchingShaderConstant->m_type_rows);
pass.m_arguments.push_back(argument); pass.m_arguments.push_back(argument);
pass.m_handled_pixel_shader_arguments[shaderConstantIndex] = true;
return true; return true;
} }
@ -504,6 +546,13 @@ namespace IW4
return constant.m_name == shaderArgument.m_argument_name; return constant.m_name == shaderArgument.m_argument_name;
}); });
if (matchingShaderConstant == shaderInfo->m_constants.end())
{
errorMessage = "Could not find argument in shader";
return false;
}
const auto shaderConstantIndex = static_cast<size_t>(matchingShaderConstant - shaderInfo->m_constants.begin());
const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant); const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant);
if (argumentIsSampler) if (argumentIsSampler)
{ {
@ -519,6 +568,11 @@ namespace IW4
argument.u.literalConst = m_zone_state->GetAllocatedLiteral(m_memory, source); argument.u.literalConst = m_zone_state->GetAllocatedLiteral(m_memory, source);
pass.m_arguments.push_back(argument); pass.m_arguments.push_back(argument);
if (shader == techset::ShaderSelector::VERTEX_SHADER)
pass.m_handled_vertex_shader_arguments[shaderConstantIndex] = true;
else
pass.m_handled_pixel_shader_arguments[shaderConstantIndex] = true;
return true; return true;
} }
@ -552,6 +606,13 @@ namespace IW4
return constant.m_name == shaderArgument.m_argument_name; return constant.m_name == shaderArgument.m_argument_name;
}); });
if (matchingShaderConstant == shaderInfo->m_constants.end())
{
errorMessage = "Could not find argument in shader";
return false;
}
const auto shaderConstantIndex = static_cast<size_t>(matchingShaderConstant - shaderInfo->m_constants.begin());
const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant); const auto argumentIsSampler = IsSamplerArgument(*matchingShaderConstant);
if (shader == techset::ShaderSelector::VERTEX_SHADER) if (shader == techset::ShaderSelector::VERTEX_SHADER)
{ {
@ -576,6 +637,11 @@ namespace IW4
argument.dest = static_cast<uint16_t>(matchingShaderConstant->m_register_index); argument.dest = static_cast<uint16_t>(matchingShaderConstant->m_register_index);
pass.m_arguments.push_back(argument); pass.m_arguments.push_back(argument);
if (shader == techset::ShaderSelector::VERTEX_SHADER)
pass.m_handled_vertex_shader_arguments[shaderConstantIndex] = true;
else
pass.m_handled_pixel_shader_arguments[shaderConstantIndex] = true;
return true; return true;
} }