From 96a15cf5253134336efd3ed94f7814e83252fe1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 4 Aug 2019 18:00:33 +0200 Subject: [PATCH] Fix the indirect postprocessing path. Fixes #12133 (but see the issue for a secondary bug). --- GPU/Common/FramebufferCommon.cpp | 2 +- GPU/Vulkan/FramebufferVulkan.cpp | 2 +- UI/NativeApp.cpp | 1 + android/jni/app-android.cpp | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GPU/Common/FramebufferCommon.cpp b/GPU/Common/FramebufferCommon.cpp index 76f1027bfd..bdd4490275 100644 --- a/GPU/Common/FramebufferCommon.cpp +++ b/GPU/Common/FramebufferCommon.cpp @@ -985,7 +985,6 @@ void FramebufferManagerCommon::CopyDisplayToOutput() { CalculatePostShaderUniforms(vfb->bufferWidth, vfb->bufferHeight, renderWidth_, renderHeight_, &uniforms); BindPostShader(uniforms); DrawTextureFlags flags = g_Config.iBufFilter == SCALE_LINEAR ? DRAWTEX_LINEAR : DRAWTEX_NEAREST; - flags = flags | DRAWTEX_TO_BACKBUFFER; DrawActiveTexture(0, 0, fbo_w, fbo_h, fbo_w, fbo_h, 0.0f, 0.0f, 1.0f, 1.0f, ROTATION_LOCKED_HORIZONTAL, flags); draw_->SetScissorRect(0, 0, pixelWidth_, pixelHeight_); @@ -1008,6 +1007,7 @@ void FramebufferManagerCommon::CopyDisplayToOutput() { flags = flags | DRAWTEX_TO_BACKBUFFER; // Fullscreen Image SetViewport2D(0, 0, pixelWidth_, pixelHeight_); + draw_->SetScissorRect(0, 0, pixelWidth_, pixelHeight_); DrawActiveTexture(x, y, w, h, (float)pixelWidth_, (float)pixelHeight_, u0, v0, u1, v1, uvRotation, flags); } else { shaderManager_->DirtyLastShader(); // dirty lastShader_ BEFORE drawing diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp index 918dafdbed..faa104aba7 100644 --- a/GPU/Vulkan/FramebufferVulkan.cpp +++ b/GPU/Vulkan/FramebufferVulkan.cpp @@ -305,8 +305,8 @@ void FramebufferManagerVulkan::DrawActiveTexture(float x, float y, float w, floa if ((flags & DRAWTEX_TO_BACKBUFFER) && g_display_rotation != DisplayRotation::ROTATE_0) { for (int i = 0; i < 4; i++) { - // backwards notation, should fix that... Vec3 v(vtx[i].x, vtx[i].y, 0.0f); + // backwards notation, should fix that... v = v * g_display_rot_matrix; vtx[i].x = v.x; vtx[i].y = v.y; diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 65ed16b406..e065035e62 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -982,6 +982,7 @@ void NativeRender(GraphicsContext *graphicsContext) { break; } + // Compensate for rotated display if needed. if (g_display_rotation != DisplayRotation::ROTATE_0) { ortho = ortho * g_display_rot_matrix; } diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index c61acb745e..8d6e5f4c44 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -645,7 +645,7 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_backbufferResize(JNIEnv ILOG("Size change detected (previously %d,%d) - calling NativeResized()", old_w, old_h); NativeResized(); } else { - ILOG("Size didn't change."); + ILOG("NativeApp::backbufferReisze: Size didn't change."); } }