diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs index e7cd7bf60e..1ae176e10e 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IEmulator.cs @@ -53,7 +53,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS private void OnVideoRefresh() { - _core.Encore_GetVideoVirtualDimensions(_context, out _encoreVideoProvider.VW, out _encoreVideoProvider.VH); _core.Encore_GetVideoBufferDimensions(_context, out _encoreVideoProvider.BW, out _encoreVideoProvider.BH); _encoreVideoProvider.VideoDirty = true; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IVideoProvider.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IVideoProvider.cs index 246b026d23..1dfb1efe01 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IVideoProvider.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.IVideoProvider.cs @@ -4,8 +4,6 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS { public class EncoreVideoProvider : IVideoProvider { - internal int VW = 400; - internal int VH = 480; internal int BW = 400; internal int BH = 480; internal bool VideoDirty; @@ -20,8 +18,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS } // ReSharper disable ConvertToAutoPropertyWhenPossible - public int VirtualWidth => VW; - public int VirtualHeight => VH; + public int VirtualWidth => BW; + public int VirtualHeight => BH; public int BufferWidth => BW; public int BufferHeight => BH; public int VsyncNumerator => 268111856; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IGLTextureProvider.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IGLTextureProvider.cs index f93f6dc12e..ce5d91ab81 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IGLTextureProvider.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.IGLTextureProvider.cs @@ -33,8 +33,8 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS return vb; } - public int VirtualWidth { get; internal set; } - public int VirtualHeight { get; internal set; } + public int VirtualWidth => _vp.BufferWidth; + public int VirtualHeight => _vp.BufferHeight; public int BufferWidth => _vp.BufferWidth; public int BufferHeight => _vp.BufferHeight; public int VsyncNumerator => _vp.VsyncNumerator; diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs index b0a22006f4..563ec856c2 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.ISettable.cs @@ -474,12 +474,10 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS }; _openGLProvider.ActivateGLContext(_glContext); // SetScreenSettings will re-present the frame, so needs OpenGL context active - _core.SetScreenSettings(_console, ref screenSettings, out var w , out var h, out var vw, out var vh); + _core.SetScreenSettings(_console, ref screenSettings, out var w , out var h, out _, out _); BufferWidth = w; BufferHeight = h; - _glTextureProvider.VirtualWidth = vw; - _glTextureProvider.VirtualHeight = vh; _glTextureProvider.VideoDirty = true; }