From 5e6c837cedc29c29ca74d30fa476df50c09c73e8 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Tue, 10 Sep 2013 22:26:29 +0200 Subject: [PATCH] Fix issue where the SoftGPU would render double size if "antialiasing" was on. --- GPU/Software/SoftGpu.cpp | 6 +++--- GPU/Software/SoftGpu.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index 428110d253..b00b588577 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.cpp @@ -151,9 +151,9 @@ SoftGPU::~SoftGPU() } // Copies RGBA8 data from RAM to the currently bound render target. -void CopyToCurrentFboFromRam(u8* data, int srcwidth, int srcheight, int dstwidth, int dstheight) +void SoftGPU::CopyToCurrentFboFromRam(u8* data, int srcwidth, int srcheight, int dstwidth, int dstheight) { - glDisable(GL_BLEND); + glDisable(GL_BLEND); glViewport(0, 0, dstwidth, dstheight); glScissor(0, 0, dstwidth, dstheight); @@ -240,7 +240,7 @@ void SoftGPU::CopyDisplayToOutput() void SoftGPU::CopyDisplayToOutputInternal() { // The display always shows 480x272. - CopyToCurrentFboFromRam(fb, FB_WIDTH, FB_HEIGHT, PSP_CoreParameter().renderWidth, PSP_CoreParameter().renderHeight); + CopyToCurrentFboFromRam(fb, FB_WIDTH, FB_HEIGHT, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight); } void SoftGPU::ProcessEvent(GPUEvent ev) { diff --git a/GPU/Software/SoftGpu.h b/GPU/Software/SoftGpu.h index 3dbc63701b..7c866508e4 100644 --- a/GPU/Software/SoftGpu.h +++ b/GPU/Software/SoftGpu.h @@ -49,6 +49,7 @@ public: protected: virtual void FastRunLoop(DisplayList &list); virtual void ProcessEvent(GPUEvent ev); + void CopyToCurrentFboFromRam(u8* data, int srcwidth, int srcheight, int dstwidth, int dstheight); private: void CopyDisplayToOutputInternal();