ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Mac] Register platform resources for disposal

Browse source
This commit is contained in:
thefiddler 2014-07-23 09:21:28 +02:00
parent 77a44b2c8e
commit 8f03b09dad
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Source/OpenTK/Platform/MacOS/MacOSFactory.cs
View file

@ -49,22 +49,29 @@ namespace OpenTK.Platform.MacOS
public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device) public override INativeWindow CreateNativeWindow(int x, int y, int width, int height, string title, GraphicsMode mode, GameWindowFlags options, DisplayDevice device)
{ {
return new CocoaNativeWindow(x, y, width, height, title, mode, options, device); INativeWindow window = new CocoaNativeWindow(x, y, width, height, title, mode, options, device);
RegisterResource(window);
return window;
} }
public override IDisplayDeviceDriver CreateDisplayDeviceDriver() public override IDisplayDeviceDriver CreateDisplayDeviceDriver()
{ {
// Does not implement IDisposable
return new QuartzDisplayDeviceDriver(); return new QuartzDisplayDeviceDriver();
} }
public override IGraphicsContext CreateGLContext(GraphicsMode mode, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags) public override IGraphicsContext CreateGLContext(GraphicsMode mode, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags)
{ {
return new CocoaContext(mode, window, shareContext, major, minor); IGraphicsContext context = new CocoaContext(mode, window, shareContext, major, minor);
RegisterResource(context);
return context;
} }
public override IGraphicsContext CreateGLContext(ContextHandle handle, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags) public override IGraphicsContext CreateGLContext(ContextHandle handle, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags)
{ {
return new CocoaContext(handle, window, shareContext, major, minor); IGraphicsContext context = new CocoaContext(handle, window, shareContext, major, minor);
RegisterResource(context);
return context;
} }
public override GraphicsContext.GetCurrentContextDelegate CreateGetCurrentGraphicsContext() public override GraphicsContext.GetCurrentContextDelegate CreateGetCurrentGraphicsContext()
@ -98,12 +105,12 @@ namespace OpenTK.Platform.MacOS
{ {
if (!IsDisposed) if (!IsDisposed)
{ {
base.Dispose(manual);
if (manual) if (manual)
{ {
InputDriver.Dispose(); InputDriver.Dispose();
} }
base.Dispose(manual);
} }
} }