From 9c6834db172d46c7434660789f46d60570233f41 Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 28 Apr 2020 18:38:04 -0400 Subject: [PATCH] fix bugs in "Display scaling by integer" caused by edits for NDS rotation (e45943c26ad67a01070083d19b20bcdfa8a25fe1) fixes #1958 --- .../DisplayManager/DisplayManager.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs index 59355a31ac..2bf7c60be2 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs @@ -754,6 +754,8 @@ namespace BizHawk.Client.EmuHawk int[] videoBuffer = videoProvider.GetVideoBuffer(); int bufferWidth = videoProvider.BufferWidth; int bufferHeight = videoProvider.BufferHeight; + int presenterTextureWidth = bufferWidth; + int presenterTextureHeight = bufferHeight; bool isGlTextureId = videoBuffer.Length == 1; int vw = videoProvider.VirtualWidth; @@ -767,8 +769,8 @@ namespace BizHawk.Client.EmuHawk if(fCoreScreenControl != null) { var sz = fCoreScreenControl.PresizeInput("default", new Size(bufferWidth, bufferHeight)); - vw = sz.Width; - vh = sz.Height; + presenterTextureWidth = vw = sz.Width; + presenterTextureHeight = vh = sz.Height; } if (Global.Config.DispFixAspectRatio) @@ -833,13 +835,6 @@ namespace BizHawk.Client.EmuHawk Filters.SourceImage fInput = filterProgram["input"] as Filters.SourceImage; fInput.Texture = videoTexture; - int presenterTextureWidth = bufferWidth; - int presenterTextureHeight = bufferHeight; - - //ZERO 29-MAR-2020 - not sure about this - presenterTextureWidth = chainOutsize.Width; - presenterTextureHeight = chainOutsize.Height; - //setup the final presentation filter Filters.FinalPresentation fPresent = filterProgram["presentation"] as Filters.FinalPresentation; fPresent.VirtualTextureSize = new Size(vw, vh);