From 271829c991af85422fa8b36bca29441ff9f53f9f Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 10 Feb 2016 21:02:19 -0800 Subject: [PATCH 1/2] Consider depth blitting a slow framebuffer effect. --- GPU/Directx9/FramebufferDX9.cpp | 4 ++++ GPU/GLES/Framebuffer.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 1039fc23f7..13059eee21 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -549,6 +549,10 @@ namespace DX9 { } void FramebufferManagerDX9::BlitFramebufferDepth(VirtualFramebuffer *src, VirtualFramebuffer *dst) { + if (g_Config.bDisableSlowFramebufEffects) { + return; + } + bool matchingDepthBuffer = src->z_address == dst->z_address && src->z_stride != 0 && dst->z_stride != 0; bool matchingSize = src->width == dst->width && src->height == dst->height; if (matchingDepthBuffer && matchingSize) { diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index b2421aff8c..8999e513f0 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -773,6 +773,10 @@ void FramebufferManager::ReformatFramebufferFrom(VirtualFramebuffer *vfb, GEBuff } void FramebufferManager::BlitFramebufferDepth(VirtualFramebuffer *src, VirtualFramebuffer *dst) { + if (g_Config.bDisableSlowFramebufEffects) { + return; + } + bool matchingDepthBuffer = src->z_address == dst->z_address && src->z_stride != 0 && dst->z_stride != 0; bool matchingSize = src->width == dst->width && src->height == dst->height; if (matchingDepthBuffer && matchingSize) { From 8bea240c256d0b065638614b3d45c5775e790ac1 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Wed, 10 Feb 2016 21:02:41 -0800 Subject: [PATCH 2/2] Atrac: Specify endianness for reset info. --- Core/HLE/sceAtrac.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index d0608cb8df..5ff6d5d905 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -596,10 +596,10 @@ private: }; struct AtracSingleResetBufferInfo { - u32 writePosPtr; - u32 writableBytes; - u32 minWriteBytes; - u32 filePos; + u32_le writePosPtr; + u32_le writableBytes; + u32_le minWriteBytes; + u32_le filePos; }; struct AtracResetBufferInfo {