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

Remove old workaround.

This commit is contained in:
J.D. Purcell 2017-04-08 18:01:03 -04:00
parent f1dee6c20e
commit 1eaaaa64e1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,6 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
void ResetDevice() void ResetDevice()
{ {
devBB.Dispose();
ResetHandlers.Reset(); ResetHandlers.Reset();
for (; ; ) for (; ; )
{ {
@ -109,7 +108,6 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
System.Threading.Thread.Sleep(100); System.Threading.Thread.Sleep(100);
} }
ResetHandlers.Restore(); ResetHandlers.Restore();
devBB = dev.GetBackBuffer(0, 0);
} }
public void CreateDevice() public void CreateDevice()
@ -126,12 +124,10 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
flags |= CreateFlags.FpuPreserve; flags |= CreateFlags.FpuPreserve;
dev = new Device(d3d, 0, DeviceType.Hardware, pp.DeviceWindowHandle, flags, pp); dev = new Device(d3d, 0, DeviceType.Hardware, pp.DeviceWindowHandle, flags, pp);
devBB = dev.GetBackBuffer(0, 0);
} }
void IDisposable.Dispose() void IDisposable.Dispose()
{ {
devBB.Dispose();
ResetHandlers.Reset(); ResetHandlers.Reset();
DestroyDevice(); DestroyDevice();
d3d.Dispose(); d3d.Dispose();
@ -824,13 +820,15 @@ namespace BizHawk.Bizware.BizwareGL.Drivers.SlimDX
dev.SetRenderTarget(0, surface); dev.SetRenderTarget(0, surface);
surface.Dispose(); surface.Dispose();
} }
Surface devBB;
public void EndControl(GLControlWrapper_SlimDX9 control) public void EndControl(GLControlWrapper_SlimDX9 control)
{ {
if (control != _CurrentControl) if (control != _CurrentControl)
throw new InvalidOperationException(); throw new InvalidOperationException();
dev.SetRenderTarget(0, devBB); var surface = _CurrentControl.SwapChain.GetBackBuffer(0);
dev.SetRenderTarget(0, surface);
surface.Dispose();
_CurrentControl = null; _CurrentControl = null;
} }