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

rsx: Add support shadow1D and shadowCube

Browse source
This commit is contained in:
kd-11 2021-01-20 23:23:00 +03:00 • committed by kd-11
parent b6b9085773
commit eb086b0e3f
6 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp
View file

@ -969,7 +969,7 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
std::string swz_mask = ""; std::string swz_mask = "";
auto select = static_cast<u8>(type); auto select = static_cast<u8>(type);
if (type == rsx::texture_dimension_extended::texture_dimension_2d) if (type != rsx::texture_dimension_extended::texture_dimension_3d)
{ {
if (m_prog.shadow_textures & ref_mask) if (m_prog.shadow_textures & ref_mask)
{ {
@ -979,7 +979,7 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
} }
else else
{ {
properties.tex2d_sampler_mask |= ref_mask; properties.common_access_sampler_mask |= ref_mask;
if (m_prog.redirected_textures & ref_mask) if (m_prog.redirected_textures & ref_mask)
{ {
properties.redirected_sampler_mask |= ref_mask; properties.redirected_sampler_mask |= ref_mask;
@ -995,6 +995,14 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
} }
auto function = functions[select]; auto function = functions[select];
if (function == FUNCTION::FUNCTION_TEXTURE_SHADOW2D &&
type == rsx::texture_dimension_extended::texture_dimension_cubemap)
{
// Cubemap shadow override
function = FUNCTION::FUNCTION_TEXTURE_SHADOWCUBE;
}
SetDst(getFunction(function) + swz_mask); SetDst(getFunction(function) + swz_mask);
if (dst.exp_tex) if (dst.exp_tex)

2
rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h
View file

@ -272,7 +272,7 @@ public:
{ {
u16 in_register_mask = 0; u16 in_register_mask = 0;
u16 tex2d_sampler_mask = 0; u16 common_access_sampler_mask = 0;
u16 shadow_sampler_mask = 0; u16 shadow_sampler_mask = 0;
u16 redirected_sampler_mask = 0; u16 redirected_sampler_mask = 0;

5
rpcs3/Emu/RSX/Common/GLSLCommon.cpp
View file

@ -859,14 +859,17 @@ namespace glsl
{ {
OS << OS <<
"#define SHADOW_COORD(coord3, scale, flags) vec3(coord3.xy * scale, _test_bit(flags, DEPTH_FLOAT)? coord3.z : min(float(coord3.z), 1.0))\n" "#define SHADOW_COORD(coord3, scale, flags) vec3(coord3.xy * scale, _test_bit(flags, DEPTH_FLOAT)? coord3.z : min(float(coord3.z), 1.0))\n"
"#define SHADOW_COORD4(coord4, scale, flags) vec4(SHADOW_COORD(coord4.xyz, scale, flags), coord4.w)\n"
"#define SHADOW_COORD_PROJ(coord4, scale, flags) vec4(coord4.xy * scale, _test_bit(flags, DEPTH_FLOAT)? coord4.z : min(coord4.z, coord4.w), coord4.w)\n" "#define SHADOW_COORD_PROJ(coord4, scale, flags) vec4(coord4.xy * scale, _test_bit(flags, DEPTH_FLOAT)? coord4.z : min(coord4.z, coord4.w), coord4.w)\n"
"#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), SHADOW_COORD(coord3, texture_parameters[index].scale, TEX_FLAGS(index)))\n" "#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), SHADOW_COORD(coord3, texture_parameters[index].scale, TEX_FLAGS(index)))\n"
"#define TEX2D_SHADOWCUBE(index, coord4) texture(TEX_NAME(index), SHADOW_COORD4(coord4, texture_parameters[index].scale, TEX_FLAGS(index)))\n"
"#define TEX2D_SHADOWPROJ(index, coord4) textureProj(TEX_NAME(index), SHADOW_COORD_PROJ(coord4, texture_parameters[index].scale, TEX_FLAGS(index)))\n"; "#define TEX2D_SHADOWPROJ(index, coord4) textureProj(TEX_NAME(index), SHADOW_COORD_PROJ(coord4, texture_parameters[index].scale, TEX_FLAGS(index)))\n";
} }
else else
{ {
OS << OS <<
"#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), coord3 * vec3(texture_parameters[index].scale, 1.))\n" "#define TEX2D_SHADOW(index, coord3) texture(TEX_NAME(index), coord3 * vec3(texture_parameters[index].scale, 1.))\n"
"#define TEX2D_SHADOWCUBE(index, coord4) texture(TEX_NAME(index), coord4 * vec3(texture_parameters[index].scale, 1., 1.))\n"
"#define TEX2D_SHADOWPROJ(index, coord4) textureProj(TEX_NAME(index), coord4 * vec4(texture_parameters[index].scale, 1., 1.))\n"; "#define TEX2D_SHADOWPROJ(index, coord4) textureProj(TEX_NAME(index), coord4 * vec4(texture_parameters[index].scale, 1., 1.))\n";
} }
@ -940,6 +943,8 @@ namespace glsl
return "TEX2D_GRAD($_i, $0.xy, $1.xy, $2.xy)"; return "TEX2D_GRAD($_i, $0.xy, $1.xy, $2.xy)";
case FUNCTION::FUNCTION_TEXTURE_SHADOW2D: case FUNCTION::FUNCTION_TEXTURE_SHADOW2D:
return "TEX2D_SHADOW($_i, $0.xyz)"; return "TEX2D_SHADOW($_i, $0.xyz)";
case FUNCTION::FUNCTION_TEXTURE_SHADOWCUBE:
return "TEX2D_SHADOWCUBE($_i, $0)";
case FUNCTION::FUNCTION_TEXTURE_SHADOW2D_PROJ: case FUNCTION::FUNCTION_TEXTURE_SHADOW2D_PROJ:
return "TEX2D_SHADOWPROJ($_i, $0)"; return "TEX2D_SHADOWPROJ($_i, $0)";
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE: case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:

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

@ -32,6 +32,7 @@ enum class FUNCTION
FUNCTION_TEXTURE_SAMPLE2D_LOD, FUNCTION_TEXTURE_SAMPLE2D_LOD,
FUNCTION_TEXTURE_SAMPLE2D_GRAD, FUNCTION_TEXTURE_SAMPLE2D_GRAD,
FUNCTION_TEXTURE_SHADOW2D, FUNCTION_TEXTURE_SHADOW2D,
FUNCTION_TEXTURE_SHADOWCUBE,
FUNCTION_TEXTURE_SHADOW2D_PROJ, FUNCTION_TEXTURE_SHADOW2D_PROJ,
FUNCTION_TEXTURE_SAMPLECUBE, FUNCTION_TEXTURE_SAMPLECUBE,
FUNCTION_TEXTURE_SAMPLECUBE_BIAS, FUNCTION_TEXTURE_SAMPLECUBE_BIAS,

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

@ -136,10 +136,14 @@ void GLFragmentDecompilerThread::insertConstants(std::stringstream & OS)
} }
else if (properties.shadow_sampler_mask & mask) else if (properties.shadow_sampler_mask & mask)
{ {
if (properties.tex2d_sampler_mask & mask) if (properties.common_access_sampler_mask & mask)
{
rsx_log.error("Texture unit %d is sampled as both a shadow texture and a depth texture", index); rsx_log.error("Texture unit %d is sampled as both a shadow texture and a depth texture", index);
}
else else
samplerType = "sampler2DShadow"; {
samplerType += "Shadow";
}
} }
OS << "uniform " << samplerType << " " << PI.name << ";\n"; OS << "uniform " << samplerType << " " << PI.name << ";\n";

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

@ -134,10 +134,14 @@ void VKFragmentDecompilerThread::insertConstants(std::stringstream & OS)
if (properties.shadow_sampler_mask & mask) if (properties.shadow_sampler_mask & mask)
{ {
if (properties.tex2d_sampler_mask & mask) if (properties.common_access_sampler_mask & mask)
{
rsx_log.error("Texture unit %d is sampled as both a shadow texture and a depth texture", index); rsx_log.error("Texture unit %d is sampled as both a shadow texture and a depth texture", index);
}
else else
samplerType = "sampler2DShadow"; {
samplerType += "Shadow";
}
} }
vk::glsl::program_input in; vk::glsl::program_input in;