From b991dd5bd397643bc2fccc02e147c4373d943da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 5 Nov 2017 10:01:03 +0100 Subject: [PATCH] Should be bufferWidth here, not width. Thanks unknown. Get rid of Source.cpp, oops. --- GPU/Common/FramebufferCommon.cpp | 6 +++--- GPU/GPU.vcxproj | 3 +-- GPU/GPU.vcxproj.filters | 5 +---- GPU/Source.cpp | 0 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 GPU/Source.cpp diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index f97b2117a374..677340c170b1 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -2033,9 +2033,9 @@ void FramebufferManagerCommon::PackFramebufferSync_(VirtualFramebuffer *vfb, int } void FramebufferManagerCommon::ReadFramebufferToMemory(VirtualFramebuffer *vfb, bool sync, int x, int y, int w, int h) { - // Clamp to width. Sometimes block transfers can cause this to hit. - if (x + w >= vfb->width) { - w = vfb->width - x; + // Clamp to bufferWidth. Sometimes block transfers can cause this to hit. + if (x + w >= vfb->bufferWidth) { + w = vfb->bufferWidth - x; } if (vfb) { // We'll pseudo-blit framebuffers here to get a resized version of vfb. diff --git a/GPU/GPU.vcxproj b/GPU/GPU.vcxproj index 9c68a6fee3c3..dc3d6f11d9bd 100644 --- a/GPU/GPU.vcxproj +++ b/GPU/GPU.vcxproj @@ -360,7 +360,6 @@ - @@ -386,4 +385,4 @@ - \ No newline at end of file + diff --git a/GPU/GPU.vcxproj.filters b/GPU/GPU.vcxproj.filters index 6e85d8e48f9b..8aa538205750 100644 --- a/GPU/GPU.vcxproj.filters +++ b/GPU/GPU.vcxproj.filters @@ -531,11 +531,8 @@ Vulkan - - Common - Common - \ No newline at end of file + diff --git a/GPU/Source.cpp b/GPU/Source.cpp deleted file mode 100644 index e69de29bb2d1..000000000000