libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-29 11:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow memcpy gpu downloads.

Browse Source 
Fixes FF4 battle transition effect, Trails in the Sky menu, etc.
This commit is contained in:
Unknown W. Brackets 2014-05-25 20:35:27 -07:00
parent 365012ec58
commit 9195019872
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
GPU/GLES/Framebuffer.cpp
View File

@ -1834,7 +1834,11 @@ void FramebufferManager::UpdateFromMemory(u32 addr, int size, bool safe) {
}
}
void FramebufferManager::NotifyFramebufferCopy(u32 src, u32 dst, int size) {
bool FramebufferManager::NotifyFramebufferCopy(u32 src, u32 dst, int size) {
if (!(g_Config.iRenderingMode == FB_BUFFERED_MODE)) {
return false;
}
// MotoGP workaround
if (Memory::IsVRAMAddress(src) && Memory::IsRAMAddress(dst)) {
for (size_t i = 0; i < vfbs_.size(); i++) {
@ -1871,16 +1875,24 @@ void FramebufferManager::NotifyFramebufferCopy(u32 src, u32 dst, int size) {
// BlitFramebuffer_(dstBuffer, 0, 0, srcBuffer, 0, 0, srcBuffer->width, srcBuffer->height, 0);
// }
}
Memory::Memcpy(dst, Memory::GetPointer(src), size);
return true;
} else if (dstBuffer) {
WARN_LOG_REPORT_ONCE(btucpy, G3D, "Memcpy fbo upload (not supported) %08x -> %08x", src, dst);
// Here we should just draw the pixels into the buffer.
// if (g_Config.bBlockTransferGPU) {
// }
Memory::Memcpy(dst, Memory::GetPointer(src), size);
return true;
} else if (srcBuffer && g_Config.iRenderingMode == FB_BUFFERED_MODE) {
WARN_LOG_REPORT_ONCE(btdcpy, G3D, "Memcpy fbo download (not supported) %08x -> %08x", src, dst);
// if (g_Config.bBlockTransferGPU) {
// ReadFramebufferToMemory(srcBuffer, true, 0, 0, srcBuffer->width, srcBuffer->height);
// }
WARN_LOG_REPORT_ONCE(btdcpy, G3D, "Memcpy fbo download %08x -> %08x", src, dst);
if (g_Config.bBlockTransferGPU) {
// TODO: Validate x/y/w/h based on size and offset?
ReadFramebufferToMemory(srcBuffer, true, 0, 0, srcBuffer->width, srcBuffer->height);
}
return false;
} else {
return false;
}
}

2
GPU/GLES/Framebuffer.h
View File

@ -210,7 +210,7 @@ public:
return true;
}
void NotifyFramebufferCopy(u32 src, u32 dest, int size);
bool NotifyFramebufferCopy(u32 src, u32 dest, int size);
void DestroyFramebuf(VirtualFramebuffer *vfb);

10
GPU/GLES/GLES_GPU.cpp
View File

@ -1963,10 +1963,12 @@ void GLES_GPU::InvalidateCacheInternal(u32 addr, int size, GPUInvalidationType t
bool GLES_GPU::UpdateMemory(u32 dest, u32 src, int size) {
// Track stray copies of a framebuffer in RAM. MotoGP does this.
if (framebufferManager_.MayIntersectFramebuffer(src) || framebufferManager_.MayIntersectFramebuffer(dest)) {
// TODO: Copy in the right order.
Memory::Memcpy(dest, Memory::GetPointer(src), size);
framebufferManager_.NotifyFramebufferCopy(src, dest, size);
InvalidateCache(dest, size, GPU_INVALIDATE_HINT);
if (!framebufferManager_.NotifyFramebufferCopy(src, dest, size)) {
Memory::Memcpy(dest, Memory::GetPointer(src), size);
InvalidateCache(dest, size, GPU_INVALIDATE_HINT);
} else {
InvalidateCache(dest, size, GPU_INVALIDATE_HINT);
}
return true;
}