[Vulkan] Change VkMemoryBlock into a struct.

veldrid · Apr 8, 2018 · 4b908fa · 4b908fa
1 parent 66b9326
commit 4b908fa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/Veldrid/Vk/VkDeviceMemoryManager.cs b/src/Veldrid/Vk/VkDeviceMemoryManager.cs
@@ -214,7 +214,7 @@ public bool Allocate(ulong size, ulong alignment, out VkMemoryBlock block)
                         }
                     }
 
-                    block = null;
+                    block = default(VkMemoryBlock);
                     return false;
                 }
             }
@@ -288,7 +288,7 @@ internal IntPtr Map(VkMemoryBlock memoryBlock)
     }
 
     [DebuggerDisplay("[Mem:{DeviceMemory.Handle}] Off:{Offset}, Size:{Size}")]
-    internal unsafe class VkMemoryBlock
+    internal unsafe struct VkMemoryBlock : IEquatable<VkMemoryBlock>
     {
         public readonly uint MemoryTypeIndex;
         public readonly VkDeviceMemory DeviceMemory;
@@ -308,5 +308,12 @@ public VkMemoryBlock(VkDeviceMemory memory, ulong offset, ulong size, uint memor
             MemoryTypeIndex = memoryTypeIndex;
             BaseMappedPointer = mappedPtr;
         }
+
+        public bool Equals(VkMemoryBlock other)
+        {
+            return DeviceMemory.Equals(other.DeviceMemory)
+                && Offset.Equals(other.Offset)
+                && Size.Equals(other.Size);
+        }
     }
 }
diff --git a/src/Veldrid/Vk/VkGraphicsDevice.cs b/src/Veldrid/Vk/VkGraphicsDevice.cs
@@ -722,7 +722,7 @@ private void CreateGraphicsCommandPool()
 
         protected override MappedResource MapCore(MappableResource resource, MapMode mode, uint subresource)
         {
-            VkMemoryBlock memoryBlock = null;
+            VkMemoryBlock memoryBlock = default(VkMemoryBlock);
             IntPtr mappedPtr = IntPtr.Zero;
             uint sizeInBytes;
             uint offset = 0;
@@ -744,7 +744,7 @@ protected override MappedResource MapCore(MappableResource resource, MapMode mod
                 depthPitch = (uint)layout.depthPitch;
             }
 
-            if (memoryBlock != null)
+            if (memoryBlock.DeviceMemory.Handle != 0)
             {
                 if (memoryBlock.IsPersistentMapped)
                 {
@@ -769,7 +769,7 @@ protected override MappedResource MapCore(MappableResource resource, MapMode mod
 
         protected override void UnmapCore(MappableResource resource, uint subresource)
         {
-            VkMemoryBlock memoryBlock = null;
+            VkMemoryBlock memoryBlock = default(VkMemoryBlock);
             if (resource is VkBuffer buffer)
             {
                 memoryBlock = buffer.Memory;
@@ -780,7 +780,7 @@ protected override void UnmapCore(MappableResource resource, uint subresource)
                 memoryBlock = tex.Memory;
             }
 
-            if (memoryBlock != null && !memoryBlock.IsPersistentMapped)
+            if (memoryBlock.DeviceMemory.Handle != 0 && !memoryBlock.IsPersistentMapped)
             {
                 vkUnmapMemory(_device, memoryBlock.DeviceMemory);
             }

diff --git a/src/Veldrid/Vk/VkTexture.cs b/src/Veldrid/Vk/VkTexture.cs
@@ -353,7 +353,7 @@ public override void Dispose()
                     vkDestroyImage(_gd.Device, _optimalImage, null);
                 }
 
-                if (_memoryBlock != null)
+                if (_memoryBlock.DeviceMemory.Handle != 0)
                 {
                     _gd.MemoryManager.Free(_memoryBlock);
                 }