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

rsx: Fix nv308a::color

Browse source
This commit is contained in:
kd-11 2018-07-01 20:47:10 +03:00 • committed by kd-11
parent dceba8a92b
commit 66854b78fa
2 changed files with 61 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -582,12 +582,58 @@ namespace rsx
{ {
static void impl(thread* rsx, u32 _reg, u32 arg) static void impl(thread* rsx, u32 _reg, u32 arg)
{ {
u16 x = method_registers.nv308a_x(); if (index >= method_registers.nv308a_size_out_x())
u16 y = method_registers.nv308a_y(); {
// Skip
return;
}
const u32 pixel_offset = (method_registers.blit_engine_output_pitch_nv3062() * y) + (x << 2); u32 color = arg;
u32 address = get_address(method_registers.blit_engine_output_offset_nv3062() + pixel_offset + index * 4, method_registers.blit_engine_output_location_nv3062()); u32 write_len = 4;
vm::write32(address, arg); switch (method_registers.blit_engine_nv3062_color_format())
{
case blit_engine::transfer_destination_format::a8r8g8b8:
case blit_engine::transfer_destination_format::y32:
{
// Bit cast
break;
}
case blit_engine::transfer_destination_format::r5g6b5:
{
// Input is considered to be ARGB8
u32 r = (arg >> 16) & 0xFF;
u32 g = (arg >> 8) & 0xFF;
u32 b = arg & 0xFF;
r = u32(r * 32 / 255.f);
g = u32(g * 64 / 255.f);
b = u32(b * 32 / 255.f);
color = (r << 11) | (g << 5) | b;
write_len = 2;
break;
}
default:
{
fmt::throw_exception("Unreachable" HERE);
}
}
const u16 x = method_registers.nv308a_x();
const u16 y = method_registers.nv308a_y();
const u32 pixel_offset = (method_registers.blit_engine_output_pitch_nv3062() * y) + (x * write_len);
u32 address = get_address(method_registers.blit_engine_output_offset_nv3062() + pixel_offset + (index * write_len), method_registers.blit_engine_output_location_nv3062());
switch (write_len)
{
case 4:
vm::write32(address, color);
break;
case 2:
vm::write16(address, (u16)(color));
break;
default:
fmt::throw_exception("Unreachable" HERE);
}
rsx->m_graphics_state |= rsx::pipeline_state::fragment_program_dirty; rsx->m_graphics_state |= rsx::pipeline_state::fragment_program_dirty;
} }

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

@ -1169,6 +1169,16 @@ namespace rsx
return decode<NV308A_POINT>().y(); return decode<NV308A_POINT>().y();
} }
u16 nv308a_size_in_x() const
{
return u16(registers[NV308A_SIZE_IN] & 0xFFFF);
}
u16 nv308a_size_out_x() const
{
return u16(registers[NV308A_SIZE_OUT] & 0xFFFF);
}
void commit_4_transform_program_instructions(u32 index) void commit_4_transform_program_instructions(u32 index)
{ {
u32& load = registers[NV4097_SET_TRANSFORM_PROGRAM_LOAD]; u32& load = registers[NV4097_SET_TRANSFORM_PROGRAM_LOAD];