archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 09:48:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix false alphakill flags when texture fetch is optimized away

Browse source
This commit is contained in:
kd-11 2017-03-21 14:35:08 +03:00
parent 458e5fa4e1
commit 8fa3f0721e
4 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rpcs3/Emu/RSX/Common/ShaderParam.h
View file

@ -110,6 +110,17 @@ struct ParamArray
return nullptr; return nullptr;
} }
bool HasParamTypeless(const ParamFlag flag, const std::string& name)
{
for (u32 i = 0; i<params[flag].size(); ++i)
{
if (params[flag][i].SearchName(name))
return true;
}
return false;
}
bool HasParam(const ParamFlag flag, std::string type, const std::string& name) bool HasParam(const ParamFlag flag, std::string type, const std::string& name)
{ {
ParamType* t = SearchParam(flag, type); ParamType* t = SearchParam(flag, type);

8
rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
View file

@ -348,8 +348,12 @@ void D3D12FragmentDecompiler::insertMainEnd(std::stringstream & OS)
{ {
if (m_prog.textures_alpha_kill[index]) if (m_prog.textures_alpha_kill[index])
{ {
std::string fetch_texture = insert_texture_fetch(m_prog, index) + ".a"; const std::string texture_name = "tex" + std::to_string(index);
OS << make_comparison_test((rsx::comparison_function)m_prog.textures_zfunc[index], "", "0", fetch_texture); if (m_parr.HasParamTypeless(PF_PARAM_UNIFORM, texture_name))
{
std::string fetch_texture = insert_texture_fetch(m_prog, index) + ".a";
OS << make_comparison_test((rsx::comparison_function)m_prog.textures_zfunc[index], "", "0", fetch_texture);
}
} }
} }

8
rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
View file

@ -370,8 +370,12 @@ void GLFragmentDecompilerThread::insertMainEnd(std::stringstream & OS)
{ {
if (m_prog.textures_alpha_kill[index]) if (m_prog.textures_alpha_kill[index])
{ {
std::string fetch_texture = insert_texture_fetch(m_prog, index) + ".a"; const std::string texture_name = "tex" + std::to_string(index);
OS << make_comparison_test((rsx::comparison_function)m_prog.textures_zfunc[index], "", "0", fetch_texture); if (m_parr.HasParamTypeless(PF_PARAM_UNIFORM, texture_name))
{
std::string fetch_texture = insert_texture_fetch(m_prog, index) + ".a";
OS << make_comparison_test((rsx::comparison_function)m_prog.textures_zfunc[index], "", "0", fetch_texture);
}
} }
} }

8
rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp
View file

@ -373,8 +373,12 @@ void VKFragmentDecompilerThread::insertMainEnd(std::stringstream & OS)
{ {
if (m_prog.textures_alpha_kill[index]) if (m_prog.textures_alpha_kill[index])
{ {
std::string fetch_texture = vk::insert_texture_fetch(m_prog, index) + ".a"; const std::string texture_name = "tex" + std::to_string(index);
OS << make_comparison_test((rsx::comparison_function)m_prog.textures_zfunc[index], "", "0", fetch_texture); if (m_parr.HasParamTypeless(PF_PARAM_UNIFORM, texture_name))
{
std::string fetch_texture = vk::insert_texture_fetch(m_prog, index) + ".a";
OS << make_comparison_test((rsx::comparison_function)m_prog.textures_zfunc[index], "", "0", fetch_texture);
}
} }
} }