From 04d94de392b6e5ca4f82acc233df7b3f97abca36 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bruyère Date: Fri, 5 Apr 2019 14:13:20 +0200 Subject: Activable pattern wip --- vke/src/Buffer.cs | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'vke/src/Buffer.cs') diff --git a/vke/src/Buffer.cs b/vke/src/Buffer.cs index 1ad293e..d11c7da 100644 --- a/vke/src/Buffer.cs +++ b/vke/src/Buffer.cs @@ -111,9 +111,12 @@ namespace VKE { } public override void Activate () { - allocateMemory (); - bindMemory (0); - SetupDescriptor (); + if (state != ActivableState.Activated) { + allocateMemory (); + bindMemory (0); + SetupDescriptor (); + } + base.Activate (); } @@ -158,18 +161,11 @@ namespace VKE { Utils.CheckResult (vkBindBufferMemory (dev.VkDev, handle, vkMemory, offset)); } protected override void Dispose (bool disposing) { - if (references>0) - return; - if (!isDisposed) { - base.Dispose (disposing); - if (!disposing) - System.Diagnostics.Debug.WriteLine ($"A Buffer Ressource was not properly disposed."); - - - vkDestroyBuffer (dev.VkDev, handle, IntPtr.Zero); - - isDisposed = true; - } + if (state == ActivableState.Activated) { + base.Dispose (disposing); + vkDestroyBuffer (dev.VkDev, handle, IntPtr.Zero); + } + state = ActivableState.Disposed; } } } -- cgit v1.3.1-4-g156e