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

rsx: Fix the default shadow codegen path

Browse source
This commit is contained in:
kd-11 2023-07-08 16:47:04 +03:00 • committed by kd-11
parent c9917c826a
commit 186fe53279
7 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,6 +201,7 @@ void GLFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)
m_shader_props.require_tex1D_ops = properties.has_tex1D; m_shader_props.require_tex1D_ops = properties.has_tex1D;
m_shader_props.require_tex2D_ops = properties.has_tex2D; m_shader_props.require_tex2D_ops = properties.has_tex2D;
m_shader_props.require_tex3D_ops = properties.has_tex3D; m_shader_props.require_tex3D_ops = properties.has_tex3D;
m_shader_props.require_shadowProj_ops = properties.shadow_sampler_mask != 0 && properties.has_texShadowProj;
glsl::insert_glsl_legacy_function(OS, m_shader_props); glsl::insert_glsl_legacy_function(OS, m_shader_props);
} }

13
rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp
View file

@ -1145,6 +1145,19 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
AddCode("_enable_texture_expand();"); AddCode("_enable_texture_expand();");
} }
// Shadow proj
switch (func_id)
{
case FUNCTION::TEXTURE_SAMPLE1D_SHADOW_PROJ:
case FUNCTION::TEXTURE_SAMPLE2D_SHADOW_PROJ:
case FUNCTION::TEXTURE_SAMPLE2DMS_SHADOW_PROJ:
case FUNCTION::TEXTURE_SAMPLE3D_SHADOW_PROJ:
properties.has_texShadowProj = true;
break;
default:
break;
}
SetDst(getFunction(func_id) + swz_mask); SetDst(getFunction(func_id) + swz_mask);
if (dst.exp_tex) if (dst.exp_tex)

1
rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.h
View file

@ -292,6 +292,7 @@ public:
bool has_tex1D = false; bool has_tex1D = false;
bool has_tex2D = false; bool has_tex2D = false;
bool has_tex3D = false; bool has_tex3D = false;
bool has_texShadowProj = false;
} }
properties; properties;

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

@ -416,6 +416,11 @@ namespace glsl
enabled_options.push_back("_ENABLE_TEX3D"); enabled_options.push_back("_ENABLE_TEX3D");
} }
if (props.require_shadowProj_ops)
{
enabled_options.push_back("_ENABLE_SHADOWPROJ");
}
program_common::define_glsl_switches(OS, enabled_options); program_common::define_glsl_switches(OS, enabled_options);
enabled_options.clear(); enabled_options.clear();

8
rpcs3/Emu/RSX/Program/GLSLSnippets/RSXProg/RSXFragmentTextureOps.glsl
View file

@ -27,9 +27,9 @@ R"(
#define COORD_SCALE1(index, coord1) _texcoord_xform(coord1, texture_parameters[index]) #define COORD_SCALE1(index, coord1) _texcoord_xform(coord1, texture_parameters[index])
#define COORD_SCALE2(index, coord2) _texcoord_xform(coord2, texture_parameters[index]) #define COORD_SCALE2(index, coord2) _texcoord_xform(coord2, texture_parameters[index])
#define COORD_SCALE3(index, coord3) _texcoord_xform(coord3, texture_parameters[index]) #define COORD_SCALE3(index, coord3) _texcoord_xform(coord3, texture_parameters[index])
#define COORD_PROJ1(index, coord2) COORD_SCALE1(coord2.x / coord2.y, texture_parameters[index]) #define COORD_PROJ1(index, coord2) COORD_SCALE1(index, coord2.x / coord2.y)
#define COORD_PROJ2(index, coord3) COORD_SCALE2(coord3.xy / coord3.z, texture_parameters[index]) #define COORD_PROJ2(index, coord3) COORD_SCALE2(index, coord3.xy / coord3.z)
#define COORD_PROJ3(index, coord4) COORD_SCALE3(coord4.xyz / coord4.w, texture_parameters[index]) #define COORD_PROJ3(index, coord4) COORD_SCALE3(index, coord4.xyz / coord4.w)
#ifdef _ENABLE_TEX1D #ifdef _ENABLE_TEX1D
#define TEX1D(index, coord1) _process_texel(texture(TEX_NAME(index), COORD_SCALE1(index, coord1)), TEX_FLAGS(index)) #define TEX1D(index, coord1) _process_texel(texture(TEX_NAME(index), COORD_SCALE1(index, coord1)), TEX_FLAGS(index))
@ -106,7 +106,7 @@ vec2 _texcoord_xform(const in vec2 coord, const in sampler_info params)
} }
#endif #endif
#ifdef _ENABLE_TEX3D #if defined(_ENABLE_TEX3D) || defined(_ENABLE_SHADOWPROJ)
vec3 _texcoord_xform(const in vec3 coord, const in sampler_info params) vec3 _texcoord_xform(const in vec3 coord, const in sampler_info params)
{ {
vec3 result = fma( vec3 result = fma(

1
rpcs3/Emu/RSX/Program/GLSLTypes.h
View file

@ -47,5 +47,6 @@ namespace glsl
bool require_tex1D_ops : 1; // Include 1D texture stuff bool require_tex1D_ops : 1; // Include 1D texture stuff
bool require_tex2D_ops : 1; // Include 2D texture stuff bool require_tex2D_ops : 1; // Include 2D texture stuff
bool require_tex3D_ops : 1; // Include 3D texture stuff (including cubemap) bool require_tex3D_ops : 1; // Include 3D texture stuff (including cubemap)
bool require_shadowProj_ops : 1; // Include shadow2DProj projection textures (1D is unsupported anyway)
}; };
}; };

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

@ -253,6 +253,7 @@ void VKFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)
m_shader_props.require_tex1D_ops = properties.has_tex1D; m_shader_props.require_tex1D_ops = properties.has_tex1D;
m_shader_props.require_tex2D_ops = properties.has_tex2D; m_shader_props.require_tex2D_ops = properties.has_tex2D;
m_shader_props.require_tex3D_ops = properties.has_tex3D; m_shader_props.require_tex3D_ops = properties.has_tex3D;
m_shader_props.require_shadowProj_ops = properties.shadow_sampler_mask != 0 && properties.has_texShadowProj;
glsl::insert_glsl_legacy_function(OS, m_shader_props); glsl::insert_glsl_legacy_function(OS, m_shader_props);
} }