midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GPU: Make framebuffer code format-aware.

Browse Source
This commit is contained in:
Tony Wasserka 2014-07-11 19:48:01 +02:00
parent c6fdeb7b23
commit 357d893b26
1 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/core/hw/gpu.cpp
View File

@ -290,13 +290,54 @@ inline void Write(u32 addr, const T data) {
u8* source_pointer = Memory::GetPointer(g_regs.display_transfer.GetPhysicalInputAddress()); u8* source_pointer = Memory::GetPointer(g_regs.display_transfer.GetPhysicalInputAddress());
u8* dest_pointer = Memory::GetPointer(g_regs.display_transfer.GetPhysicalOutputAddress()); u8* dest_pointer = Memory::GetPointer(g_regs.display_transfer.GetPhysicalOutputAddress());
// TODO: Perform display transfer correctly!
for (int y = 0; y < g_regs.display_transfer.output_height; ++y) { for (int y = 0; y < g_regs.display_transfer.output_height; ++y) {
// TODO: Copy size is just guesswork! // TODO: Why does the register seem to hold twice the framebuffer width?
memcpy(dest_pointer + y * g_regs.display_transfer.output_width * 4, for (int x = 0; x < g_regs.display_transfer.output_width / 2; ++x) {
source_pointer + y * g_regs.display_transfer.input_width * 4, int source[4] = { 0, 0, 0, 0}; // rgba;
g_regs.display_transfer.output_width * 4);
switch (g_regs.display_transfer.input_format) {
case Registers::FramebufferFormat::RGBA8:
{
// TODO: Most likely got the component order messed up.
u8* srcptr = source_pointer + x * 4 + y * g_regs.display_transfer.input_width * 4 / 2;
source[0] = srcptr[0]; // blue
source[1] = srcptr[1]; // green
source[2] = srcptr[2]; // red
source[3] = srcptr[3]; // alpha
break;
}
default:
ERROR_LOG(GPU, "Unknown source framebuffer format %x", (int)g_regs.display_transfer.input_format.Value());
break;
}
switch (g_regs.display_transfer.output_format) {
/*case Registers::FramebufferFormat::RGBA8:
{
// TODO: Untested
u8* dstptr = (u32*)(dest_pointer + x * 4 + y * g_regs.display_transfer.output_width * 4);
dstptr[0] = source[0];
dstptr[1] = source[1];
dstptr[2] = source[2];
dstptr[3] = source[3];
break;
}*/
case Registers::FramebufferFormat::RGB8:
{
u8* dstptr = dest_pointer + x * 3 + y * g_regs.display_transfer.output_width * 3 / 2;
dstptr[0] = source[0]; // blue
dstptr[1] = source[1]; // green
dstptr[2] = source[2]; // red
break;
}
default:
ERROR_LOG(GPU, "Unknown destination framebuffer format %x", static_cast<int>(g_regs.display_transfer.output_format.Value()));
break;
}
}
} }
DEBUG_LOG(GPU, "DisplayTriggerTransfer: %x bytes from %x(%xx%x)-> %x(%xx%x), dst format %x", DEBUG_LOG(GPU, "DisplayTriggerTransfer: %x bytes from %x(%xx%x)-> %x(%xx%x), dst format %x",