fix bugs in "Display scaling by integer" caused by edits for NDS rotation (e45943c26a)

fixes #1958
This commit is contained in:
zeromus 2020-04-28 18:38:04 -04:00
parent cb5c49d11b
commit 9c6834db17
1 changed files with 4 additions and 9 deletions

View File

@ -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);