Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-25 16:41:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Implement GPU block copies between buffers and from buffer to RAM.

Browse Source 
(first one not very well tested, second one improves Burnout Legends sun a lot)
This commit is contained in:
Henrik Rydgard 2014-05-08 16:25:44 +02:00
parent 8273c1b956
commit 994629089e
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
GPU/GLES/Framebuffer.cpp
View File

@ -1762,34 +1762,39 @@ bool FramebufferManager::NotifyBlockTransfer(u32 dstBasePtr, int dstStride, int
DrawPixels(Memory::GetPointerUnchecked(dstBasePtr), GE_FORMAT_8888, 512);
}
// The stuff in the #ifdef is JUST for reporting, not used for anything else.
#ifndef MOBILE_DEVICE
if (reportedBlits_.insert(std::make_pair(dstBasePtr, srcBasePtr)).second) {
// Already reported/checked.
bool dstBuffer = false;
bool srcBuffer = false;
for (size_t i = 0; i < vfbs_.size(); ++i) {
VirtualFramebuffer *vfb = vfbs_[i];
if (MaskedEqual(vfb->fb_address, dstBasePtr)) {
dstBuffer = true;
}
if (MaskedEqual(vfb->fb_address, srcBasePtr)) {
srcBuffer = true;
}
VirtualFramebuffer *dstBuffer = 0;
VirtualFramebuffer *srcBuffer = 0;
for (size_t i = 0; i < vfbs_.size(); ++i) {
VirtualFramebuffer *vfb = vfbs_[i];
if (MaskedEqual(vfb->fb_address, dstBasePtr)) {
dstBuffer = vfb;
}
if (dstBuffer && srcBuffer) {
WARN_LOG_REPORT(G3D, "Intra buffer block transfer (not supported) %08x -> %08x", srcBasePtr, dstBasePtr);
} else if (dstBuffer) {
WARN_LOG_REPORT(G3D, "Block transfer upload (not supported) %08x -> %08x", srcBasePtr, dstBasePtr);
} else if (srcBuffer && g_Config.iRenderingMode == FB_BUFFERED_MODE) {
WARN_LOG_REPORT(G3D, "Block transfer download (not supported) %08x -> %08x", srcBasePtr, dstBasePtr);
if (MaskedEqual(vfb->fb_address, srcBasePtr)) {
srcBuffer = vfb;
}
}
#endif
return false;
if (dstBuffer && srcBuffer) {
if (srcBuffer == dstBuffer) {
WARN_LOG_REPORT_ONCE(dstsrc, G3D, "Intra-buffer block transfer (not supported) %08x -> %08x", srcBasePtr, dstBasePtr);
} else {
WARN_LOG_ONCE(dstnotsrc, G3D, "Inter-buffer block transfer %08x -> %08x", srcBasePtr, dstBasePtr);
// Just do the blit!
// TODO: Possibly take bpp into account somehow if games are doing really crazy things?
BlitFramebuffer_(dstBuffer, dstX, dstY, srcBuffer, srcX, srcY, width, height);
}
return true; // No need to actually do the memory copy behind, probably.
} else if (dstBuffer) {
WARN_LOG_REPORT_ONCE(btu, G3D, "Block transfer upload (not supported) %08x -> %08x", srcBasePtr, dstBasePtr);
// Here we should just draw the pixels into the buffer.
return false;
} else if (srcBuffer && g_Config.iRenderingMode == FB_BUFFERED_MODE) {
WARN_LOG_ONCE(btd, G3D, "Block transfer download %08x -> %08x", srcBasePtr, dstBasePtr);
ReadFramebufferToMemory(srcBuffer, true, srcX, srcY, width, height);
return false; // Let the bit copy happen
} else {
return false;
}
}
void FramebufferManager::Resized() {

4
GPU/GLES/Framebuffer.h
View File

@ -261,8 +261,4 @@ private:
AsyncPBO *pixelBufObj_; //this isn't that large
u8 currentPBO_;
#endif
// This is to be used only for reporting of strange blits. Don't control behaviour as
// this is "permanent" while framebuffers aren't.
std::set<std::pair<u32, u32>> reportedBlits_;
};