mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-08 09:09:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Shader pipeline fixes and improvements

Browse source 
- Do not set zfunc if alphakill is not enabled. This is because at the moment alphakill requires a different shader to be built

- use glsl loop-unroll friendly comparison; skip vertex input compare if either key requests it

- Minor tweaks to fp key generation
This commit is contained in:
kd-11 2017-08-11 20:47:14 +03:00
commit c04aa05398
5 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/RSX/Common/GLSLCommon.h
View file

@ -121,8 +121,10 @@ namespace glsl
OS << " bool reverse_order = false;\n"; OS << " bool reverse_order = false;\n";
OS << "\n"; OS << "\n";
OS << " int first_byte = (vertex_id * desc.stride) + desc.starting_offset;\n"; OS << " int first_byte = (vertex_id * desc.stride) + desc.starting_offset;\n";
OS << " for (int n = 0; n < desc.attribute_size; n++)\n"; OS << " for (int n = 0; n < 4; n++)\n";
OS << " {\n"; OS << " {\n";
OS << " if (n == desc.attribute_size) break;\n";
OS << "\n";
OS << " switch (desc.type)\n"; OS << " switch (desc.type)\n";
OS << " {\n"; OS << " {\n";
OS << " case 0:\n"; OS << " case 0:\n";

2
rpcs3/Emu/RSX/Common/ProgramStateCache.cpp
View file

@ -28,7 +28,7 @@ bool vertex_program_compare::operator()(const RSXVertexProgram &binary1, const R
return false; return false;
if (binary1.data.size() != binary2.data.size()) if (binary1.data.size() != binary2.data.size())
return false; return false;
if (!binary1.skip_vertex_input_check && binary1.rsx_vertex_inputs != binary2.rsx_vertex_inputs) if (!binary1.skip_vertex_input_check && !binary2.skip_vertex_input_check && binary1.rsx_vertex_inputs != binary2.rsx_vertex_inputs)
return false; return false;
const qword *instBuffer1 = (const qword*)binary1.data.data(); const qword *instBuffer1 = (const qword*)binary1.data.data();

2
rpcs3/Emu/RSX/RSXFragmentProgram.h
View file

@ -237,7 +237,7 @@ struct RSXFragmentProgram
float texture_pitch_scale[16]; float texture_pitch_scale[16];
u8 textures_alpha_kill[16]; u8 textures_alpha_kill[16];
u32 textures_zfunc[16]; u8 textures_zfunc[16];
bool valid; bool valid;

17
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -1098,18 +1098,27 @@ namespace rsx
{ {
auto &tex = rsx::method_registers.fragment_textures[i]; auto &tex = rsx::method_registers.fragment_textures[i];
result.texture_pitch_scale[i] = 1.f; result.texture_pitch_scale[i] = 1.f;
result.textures_alpha_kill[i] = 0;
result.textures_zfunc[i] = 0;
if (!tex.enabled()) if (!tex.enabled())
{ {
texture_dimensions[i] = texture_dimension_extended::texture_dimension_2d; texture_dimensions[i] = texture_dimension_extended::texture_dimension_2d;
result.textures_alpha_kill[i] = 0;
result.textures_zfunc[i] = 0;
} }
else else
{ {
texture_dimensions[i] = tex.get_extended_texture_dimension(); texture_dimensions[i] = tex.get_extended_texture_dimension();
result.textures_alpha_kill[i] = tex.alpha_kill_enabled() ? 1 : 0;
result.textures_zfunc[i] = tex.zfunc(); if (tex.alpha_kill_enabled())
{
//alphakill can be ignored unless a valid comparison function is set
const rsx::comparison_function func = (rsx::comparison_function)tex.zfunc();
if (func < rsx::comparison_function::always && func > rsx::comparison_function::never)
{
result.textures_alpha_kill[i] = 1;
result.textures_zfunc[i] = (u8)func;
}
}
const u32 texaddr = rsx::get_address(tex.offset(), tex.location()); const u32 texaddr = rsx::get_address(tex.offset(), tex.location());
const u32 raw_format = tex.format(); const u32 raw_format = tex.format();

4
rpcs3/Emu/RSX/rsx_cache.h
View file

@ -453,8 +453,8 @@ namespace rsx
for (u8 index = 0; index < 16; ++index) for (u8 index = 0; index < 16; ++index)
{ {
data_block.fp_alphakill_mask |= (fp.textures_alpha_kill[index] & 0x1) << index; data_block.fp_alphakill_mask |= (u32)(fp.textures_alpha_kill[index] & 0x1) << index;
data_block.fp_zfunc_mask |= (fp.textures_zfunc[index] & 0xF) << (index << 2); data_block.fp_zfunc_mask |= (u32)(fp.textures_zfunc[index] & 0xF) << (index << 2);
} }
return data_block; return data_block;