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

rsx: Pass vertex attributes streamed via register write in PS3-correct format

Browse source 
- TODO: Optimize this, we can avoid the double bswap in FIFO and then in attribute push
  Not very important since nobody is doing register push in high-performance path.
This commit is contained in:
kd-11 2021-06-13 23:34:01 +03:00 • committed by kd-11
parent 6f874be41b
commit d3ff67ffb5
3 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -341,9 +341,10 @@ namespace glsl
" ret.xy = unpackHalf2x16(tmp.x);\n" " ret.xy = unpackHalf2x16(tmp.x);\n"
" ret.zw = unpackHalf2x16(tmp.y);\n" " ret.zw = unpackHalf2x16(tmp.y);\n"
" }\n" " }\n"
" else if (desc.type == VTX_FMT_UINT8 || desc.type == VTX_FMT_UNORM8)\n" " else if (elem_size == 1) //(desc.type == VTX_FMT_UINT8 || desc.type == VTX_FMT_UNORM8)\n"
" {\n" " {\n"
" ret = vec4(desc.swap_bytes? result.wzyx : result);\n" " // Ignore bswap on single byte channels\n"
" ret = vec4(result);\n"
" }\n" " }\n"
" else //if (desc.type == VTX_FMT_COMP32)\n" " else //if (desc.type == VTX_FMT_COMP32)\n"
" {\n" " {\n"

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

@ -2279,27 +2279,14 @@ namespace rsx
} }
} //end attribute placement check } //end attribute placement check
// If data is passed via registers, it is already received in little endian // Special compressed 4 components into one 4-byte value. Decoded as one value.
const bool is_be_type = (layout.attribute_placement[index] != attribute_buffer_placement::transient); if (type == rsx::vertex_base_type::cmp)
bool to_swap_bytes = is_be_type;
switch (type)
{ {
case rsx::vertex_base_type::cmp:
// Compressed 4 components into one 4-byte value
size = 1; size = 1;
break;
case rsx::vertex_base_type::ub:
case rsx::vertex_base_type::ub256:
// These are single byte formats, but inverted order (BGRA vs ARGB) when passed via registers
to_swap_bytes = (layout.attribute_placement[index] == attribute_buffer_placement::transient);
break;
default:
break;
} }
if (to_swap_bytes) attrib1 |= swap_storage_mask; // All data is passed in in PS3-native order (BE) so swap flag should be set
attrib1 |= swap_storage_mask;
attrib0 |= (static_cast<s32>(type) << 24); attrib0 |= (static_cast<s32>(type) << 24);
attrib0 |= (size << 27); attrib0 |= (size << 27);
attrib1 |= offset_in_block[index]; attrib1 |= offset_in_block[index];

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

@ -263,16 +263,8 @@ namespace rsx
const auto vtype = vertex_data_type_from_element_type<type>::type; const auto vtype = vertex_data_type_from_element_type<type>::type;
ensure(vtype != rsx::vertex_base_type::cmp); ensure(vtype != rsx::vertex_base_type::cmp);
switch (vtype)
{
case rsx::vertex_base_type::ub:
case rsx::vertex_base_type::ub256:
// Get BE data // Get BE data
arg = std::bit_cast<u32, be_t<u32>>(arg); arg = std::bit_cast<u32, be_t<u32>>(arg);
break;
default:
break;
}
if (rsx->in_begin_end) if (rsx->in_begin_end)
{ {
@ -398,6 +390,7 @@ namespace rsx
void draw_inline_array(thread* /*rsx*/, u32 /*reg*/, u32 arg) void draw_inline_array(thread* /*rsx*/, u32 /*reg*/, u32 arg)
{ {
arg = std::bit_cast<u32, be_t<u32>>(arg);
rsx::method_registers.current_draw_clause.command = rsx::draw_command::inlined_array; rsx::method_registers.current_draw_clause.command = rsx::draw_command::inlined_array;
rsx::method_registers.current_draw_clause.inline_vertex_array.push_back(arg); rsx::method_registers.current_draw_clause.inline_vertex_array.push_back(arg);
} }