Simplify alignment passing for now

ryzendew · Jan 24, 2024 · f2b895f · f2b895f
1 parent 1b17ecc
commit f2b895f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/Ryujinx.Graphics.Vulkan/BufferManager.cs b/src/Ryujinx.Graphics.Vulkan/BufferManager.cs
@@ -266,9 +266,9 @@ public BufferHandle CreateWithHandle(
             return Unsafe.As<ulong, BufferHandle>(ref handle64);
         }
 
-        public ScopedTemporaryBuffer ReserveOrCreate(VulkanRenderer gd, CommandBufferScoped cbs, int size, out BufferHolder holder, int alignment = -1)
+        public ScopedTemporaryBuffer ReserveOrCreate(VulkanRenderer gd, CommandBufferScoped cbs, int size, out BufferHolder holder)
         {
-            StagingBufferReserved? result = StagingBuffer.TryReserveData(cbs, size, alignment);
+            StagingBufferReserved? result = StagingBuffer.TryReserveData(cbs, size);
 
             if (result.HasValue)
             {
@@ -284,9 +284,9 @@ public ScopedTemporaryBuffer ReserveOrCreate(VulkanRenderer gd, CommandBufferSco
             }
         }
 
-        public ScopedTemporaryBuffer ReserveOrCreate(VulkanRenderer gd, CommandBufferScoped cbs, int size, int alignment = -1)
+        public ScopedTemporaryBuffer ReserveOrCreate(VulkanRenderer gd, CommandBufferScoped cbs, int size)
         {
-            return ReserveOrCreate(gd, cbs, size, out _, alignment);
+            return ReserveOrCreate(gd, cbs, size, out _);
         }
 
         public unsafe MemoryRequirements GetHostImportedUsageRequirements(VulkanRenderer gd)

diff --git a/src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs b/src/Ryujinx.Graphics.Vulkan/StagingBuffer.cs
@@ -203,20 +203,15 @@ private int GetContiguousFreeSize(int alignment)
         /// </summary>
         /// <param name="cbs">Command buffer to reserve the data on</param>
         /// <param name="size">The minimum size the reserved data requires</param>
-        /// <param name="alignment">The required alignment for the buffer offset. -1 uses the most permissive alignment</param>
+        /// <param name="alignment">The required alignment for the buffer offset</param>
         /// <returns>The reserved range of the staging buffer</returns>
-        public unsafe StagingBufferReserved? TryReserveData(CommandBufferScoped cbs, int size, int alignment = -1)
+        public unsafe StagingBufferReserved? TryReserveData(CommandBufferScoped cbs, int size, int alignment)
         {
             if (size > BufferSize)
             {
                 return null;
             }
 
-            if (alignment == -1)
-            {
-                alignment = _resourceAlignment;
-            }
-
             // Temporary reserved data cannot be fragmented.
 
             if (GetContiguousFreeSize(alignment) < size)
@@ -233,6 +228,18 @@ private int GetContiguousFreeSize(int alignment)
             return ReserveDataImpl(cbs, size, alignment);
         }
 
+        /// <summary>
+        /// Reserve a range on the staging buffer for the current command buffer and upload data to it.
+        /// Uses the most permissive byte alignment.
+        /// </summary>
+        /// <param name="cbs">Command buffer to reserve the data on</param>
+        /// <param name="size">The minimum size the reserved data requires</param>
+        /// <returns>The reserved range of the staging buffer</returns>
+        public unsafe StagingBufferReserved? TryReserveData(CommandBufferScoped cbs, int size)
+        {
+            return TryReserveData(cbs, size, _resourceAlignment);
+        }
+
         private bool WaitFreeCompleted(CommandBufferPool cbp)
         {
             if (_pendingCopies.TryPeek(out var pc))