ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AUGH. re-fix "fix flashes of garbage while changing vsync toggle (includes when fast-forwarding) on d3d display method" 

by

Revert "tidy d3d display method a tiny bit, i guess"

so sensitive.

This reverts commit b8fd885d3f.
This commit is contained in:
zeromus 2016-03-27 15:46:43 -05:00
parent 59658340e7
commit c30817abbf
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/GLControlWrapper_SlimDX9.cs
View File

@ -46,7 +46,6 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
public Control Control { get { return this; } } public Control Control { get { return this; } }
public SwapChain SwapChain; public SwapChain SwapChain;
public Surface SwapChainBB;
public void SetVsync(bool state) public void SetVsync(bool state)
{ {

31
Bizware/BizHawk.Bizware.BizwareGL.SlimDX/IGL_SlimDX9.cs
View File

@ -818,7 +818,7 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
_CurrentControl = control; _CurrentControl = control;
//don't dispose this backbuffer reference, even though it's tempting to. //don't dispose this backbuffer reference, even though it's tempting to.
//it results in weird flashes of corruption when changing the vsync setting (unproven; it's another similar code sequence that broke it) //it results in weird flashes of corruption when changing the vsync setting (unproven; it's another similar code sequence that broke it)
dev.SetRenderTarget(0, _CurrentControl.SwapChainBB); dev.SetRenderTarget(0, _CurrentControl.SwapChain.GetBackBuffer(0));
} }
public void EndControl(GLControlWrapper_SlimDX9 control) public void EndControl(GLControlWrapper_SlimDX9 control)
@ -828,8 +828,7 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
//don't dispose this backbuffer reference, even though it's tempting to. //don't dispose this backbuffer reference, even though it's tempting to.
//it results in weird flashes of corruption when changing the vsync setting (unproven; it's another similar code sequence that broke it) //it results in weird flashes of corruption when changing the vsync setting (unproven; it's another similar code sequence that broke it)
//do we REALLY need this? dev.SetRenderTarget(0, dev.GetBackBuffer(0, 0));
//dev.SetRenderTarget(0, dev.GetBackBuffer(0, 0));
_CurrentControl = null; _CurrentControl = null;
} }
@ -877,33 +876,24 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
{ {
//don't dispose this backbuffer reference, even though it's tempting to. //don't dispose this backbuffer reference, even though it's tempting to.
//it results in weird flashes of corruption when changing the vsync setting //it results in weird flashes of corruption when changing the vsync setting
dev.SetRenderTarget(0, _CurrentControl.SwapChainBB); dev.SetRenderTarget(0, _CurrentControl.SwapChain.GetBackBuffer(0));
dev.DepthStencilSurface = null; dev.DepthStencilSurface = null;
return; return;
} }
var tw = rt.Opaque as TextureWrapper; var tw = rt.Opaque as TextureWrapper;
//TODO - cache surface level in an RT wrapper //TODO - cache surface level in an RT wrapper
var surf = tw.Texture.GetSurfaceLevel(0); dev.SetRenderTarget(0, tw.Texture.GetSurfaceLevel(0));
dev.SetRenderTarget(0, surf);
surf.Dispose();
dev.DepthStencilSurface = null; dev.DepthStencilSurface = null;
} }
void DestroyControlSwapChain(GLControlWrapper_SlimDX9 control)
{
if (control.SwapChain == null)
return;
control.SwapChainBB.Dispose();
control.SwapChainBB = null;
control.SwapChain.Dispose();
control.SwapChain = null;
}
public void RefreshControlSwapChain(GLControlWrapper_SlimDX9 control) public void RefreshControlSwapChain(GLControlWrapper_SlimDX9 control)
{ {
DestroyControlSwapChain(control); if (control.SwapChain != null)
{
control.SwapChain.Dispose();
control.SwapChain = null;
}
ResetHandlers.Remove(control, "SwapChain"); ResetHandlers.Remove(control, "SwapChain");
var pp = new PresentParameters var pp = new PresentParameters
@ -918,8 +908,7 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
}; };
control.SwapChain = new SwapChain(dev, pp); control.SwapChain = new SwapChain(dev, pp);
control.SwapChainBB = control.SwapChain.GetBackBuffer(0); ResetHandlers.Add(control, "SwapChain", () => { control.SwapChain.Dispose(); control.SwapChain = null; }, () => RefreshControlSwapChain(control));
ResetHandlers.Add(control, "SwapChain", () => DestroyControlSwapChain(control), () => RefreshControlSwapChain(control));
} }
DeviceLostHandler ResetHandlers = new DeviceLostHandler(); DeviceLostHandler ResetHandlers = new DeviceLostHandler();