archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 18:58:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: Possible fix for UB data type consistency

Browse source
This commit is contained in:
kd-11 2018-09-03 17:14:53 +03:00 • committed by kd-11
parent 5a08b690d5
commit 2e0ecb556c
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2416,8 +2416,6 @@ namespace rsx
s32 size = 0; s32 size = 0;
s32 attributes = 0; s32 attributes = 0;
bool swap_u8_types = false;
if (layout.attribute_placement[index] == attribute_buffer_placement::transient) if (layout.attribute_placement[index] == attribute_buffer_placement::transient)
{ {
if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::inlined_array) if (rsx::method_registers.current_draw_clause.command == rsx::draw_command::inlined_array)
@ -2428,10 +2426,6 @@ namespace rsx
attributes = layout.interleaved_blocks[0].attribute_stride; attributes = layout.interleaved_blocks[0].attribute_stride;
attributes |= default_frequency_mask | volatile_storage_mask; attributes |= default_frequency_mask | volatile_storage_mask;
// [NPEA90002] Grass is rendered via inline array
// Expects swapped bytes for u8 types
swap_u8_types = true;
} }
else else
{ {
@ -2447,10 +2441,6 @@ namespace rsx
attributes = rsx::get_vertex_type_size_on_host(type, size); attributes = rsx::get_vertex_type_size_on_host(type, size);
attributes |= default_frequency_mask | volatile_storage_mask; attributes |= default_frequency_mask | volatile_storage_mask;
// RDR intro contains text passed via immediate render mode
// Expects swapped bytes for u8 types
swap_u8_types = true;
} }
else else
{ {
@ -2461,9 +2451,6 @@ namespace rsx
attributes = rsx::get_vertex_type_size_on_host(type, size); attributes = rsx::get_vertex_type_size_on_host(type, size);
attributes |= volatile_storage_mask; attributes |= volatile_storage_mask;
// Resistance intro expects u8 types in native order
// swap_u8_types = false;
} }
} }
} }
@ -2513,7 +2500,7 @@ namespace rsx
case rsx::vertex_base_type::ub: case rsx::vertex_base_type::ub:
case rsx::vertex_base_type::ub256: case rsx::vertex_base_type::ub256:
// These are single byte formats, but inverted order (BGRA vs ARGB) when passed via registers // These are single byte formats, but inverted order (BGRA vs ARGB) when passed via registers
to_swap_bytes = swap_u8_types; to_swap_bytes = (layout.attribute_placement[index] == attribute_buffer_placement::transient);
break; break;
} }

10
rpcs3/Emu/RSX/rsx_methods.cpp
View file

@ -224,6 +224,16 @@ namespace rsx
static const size_t vertex_subreg = index % increment_per_array_index; static const size_t vertex_subreg = index % increment_per_array_index;
const auto vtype = vertex_data_type_from_element_type<type>::type; const auto vtype = vertex_data_type_from_element_type<type>::type;
verify(HERE), vtype != rsx::vertex_base_type::cmp;
switch (vtype)
{
case rsx::vertex_base_type::ub:
case rsx::vertex_base_type::ub256:
// One-way byteswap
arg = se_storage<u32>::swap(arg);
break;
}
if (rsx->in_begin_end) if (rsx->in_begin_end)
{ {