Merge branch 'feature/vulkan-index-buff-compute' into 'master'

Vulkan: Use compute shader for non-indirect unsupported topology index buffer conversions

See merge request ryubing/ryujinx!15

src/Ryujinx.Graphics.Vulkan/HelperShader.cs

@@ -874,57 +874,42 @@ namespace Ryujinx.Graphics.Vulkan
 
         public unsafe void ConvertIndexBuffer(VulkanRenderer gd,
             CommandBufferScoped cbs,
-            BufferHolder src,
+            BufferHolder srcIndexBuffer,
-            BufferHolder dst,
+            BufferHolder dstIndexBuffer,
             IndexBufferPattern pattern,
             int indexSize,
             int srcOffset,
             int indexCount)
         {
             // TODO: Support conversion with primitive restart enabled.
-            // TODO: Convert with a compute shader?
 
+            int primitiveCount = pattern.GetPrimitiveCount(indexCount);
             int convertedCount = pattern.GetConvertedCount(indexCount);
             int outputIndexSize = 4;
             
-            Buffer srcBuffer = src.GetBuffer().Get(cbs, srcOffset, indexCount * indexSize).Value;
+            Buffer dstBuffer = dstIndexBuffer.GetBuffer().Get(cbs, 0, convertedCount * outputIndexSize).Value;
-            Buffer dstBuffer = dst.GetBuffer().Get(cbs, 0, convertedCount * outputIndexSize).Value;
 
-            gd.Api.CmdFillBuffer(cbs.CommandBuffer, dstBuffer, 0, Vk.WholeSize, 0);
+            const int ParamsBufferSize = 16 * sizeof(int);
 
-            List<BufferCopy> bufferCopy = [];
+            Span<int> shaderParams = stackalloc int[ParamsBufferSize / sizeof(int)];
-            int outputOffset = 0;
 
-            // Try to merge copies of adjacent indices to reduce copy count.
+            shaderParams[8] = pattern.PrimitiveVertices;
-            int sequenceStart = 0;
+            shaderParams[9] = pattern.PrimitiveVerticesOut;
-            int sequenceLength = 0;
+            shaderParams[10] = indexSize;
+            shaderParams[11] = outputIndexSize;
+            shaderParams[12] = pattern.BaseIndex;
+            shaderParams[13] = pattern.IndexStride;
+            shaderParams[14] = srcOffset;
+            shaderParams[15] = primitiveCount;
 
-            foreach (int index in pattern.GetIndexMapping(indexCount))
+            pattern.OffsetIndex.CopyTo(shaderParams[..pattern.OffsetIndex.Length]);
-            {
-                if (sequenceLength > 0)
-                {
-                    if (index == sequenceStart + sequenceLength && indexSize == outputIndexSize)
-                    {
-                        sequenceLength++;
-                        continue;
-                    }
 
-                    // Commit the copy so far.
+            using var patternScoped = gd.BufferManager.ReserveOrCreate(gd, cbs, ParamsBufferSize);
-                    bufferCopy.Add(new BufferCopy((ulong)(srcOffset + sequenceStart * indexSize), (ulong)outputOffset, (ulong)(indexSize * sequenceLength)));
+            var patternBuffer = patternScoped.Holder;
-                    outputOffset += outputIndexSize * sequenceLength;
-                }
 
-                sequenceStart = index;
+            patternBuffer.SetDataUnchecked<int>(patternScoped.Offset, shaderParams);
-                sequenceLength = 1;
-            }
 
-            if (sequenceLength > 0)
+            _pipeline.SetCommandBuffer(cbs);
-            {
-                // Commit final pending copy.
-                bufferCopy.Add(new BufferCopy((ulong)(srcOffset + sequenceStart * indexSize), (ulong)outputOffset, (ulong)(indexSize * sequenceLength)));
-            }
-
-            BufferCopy[] bufferCopyArray = bufferCopy.ToArray();
 
             BufferHolder.InsertBufferBarrier(
                 gd,
@@ -937,10 +922,11 @@ namespace Ryujinx.Graphics.Vulkan
                 0,
                 convertedCount * outputIndexSize);
 
-            fixed (BufferCopy* pBufferCopy = bufferCopyArray)
+            _pipeline.SetUniformBuffers([new BufferAssignment(0, new BufferRange(patternScoped.Handle, patternScoped.Offset, ParamsBufferSize))]);
-            {
+            _pipeline.SetStorageBuffers(1, new[] { srcIndexBuffer.GetBuffer(), dstIndexBuffer.GetBuffer() });
-                gd.Api.CmdCopyBuffer(cbs.CommandBuffer, srcBuffer, dstBuffer, (uint)bufferCopyArray.Length, pBufferCopy);
+
-            }
+            _pipeline.SetProgram(_programConvertIndexBuffer);
+            _pipeline.DispatchCompute(BitUtils.DivRoundUp(primitiveCount, 16), 1, 1);
 
             BufferHolder.InsertBufferBarrier(
                 gd,
@@ -952,6 +938,8 @@ namespace Ryujinx.Graphics.Vulkan
                 PipelineStageFlags.AllCommandsBit,
                 0,
                 convertedCount * outputIndexSize);
+
+            _pipeline.Finish(gd, cbs);
         }
 
         public void CopyIncompatibleFormats(

src/Ryujinx.Graphics.Vulkan/IndexBufferPattern.cs

@@ -47,28 +47,6 @@ namespace Ryujinx.Graphics.Vulkan
             return primitiveCount * OffsetIndex.Length;
         }
 
-        public IEnumerable<int> GetIndexMapping(int indexCount)
-        {
-            int primitiveCount = GetPrimitiveCount(indexCount);
-            int index = BaseIndex;
-
-            for (int i = 0; i < primitiveCount; i++)
-            {
-                if (RepeatStart)
-                {
-                    // Used for triangle fan
-                    yield return 0;
-                }
-
-                for (int j = RepeatStart ? 1 : 0; j < OffsetIndex.Length; j++)
-                {
-                    yield return index + OffsetIndex[j];
-                }
-
-                index += IndexStride;
-            }
-        }
-
         public BufferHandle GetRepeatingBuffer(int vertexCount, out int indexCount)
         {
             int primitiveCount = GetPrimitiveCount(vertexCount);

src/Ryujinx/Assets/locales.json

@@ -4943,7 +4943,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "涡轮模式倍数:",
         "zh_TW": ""
       }
     },
@@ -4968,7 +4968,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "涡轮模式倍数的目标值。\n\n如果不确定请保留为 200。",
         "zh_TW": ""
       }
     },
@@ -4993,7 +4993,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "涡轮模式是一种模拟器功能当游戏对帧率不敏感时它可以有效地导致加速或降速。\n您可以在游戏中使用热键切换此功能,它可以在 Ryujinx 的键盘热键设置进行设置。\n\n如果不确定则保留为 200。",
         "zh_TW": ""
       }
     },
@@ -18218,7 +18218,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "{0} FPS ({1}ms), 涡轮 ({2}%)",
         "zh_TW": ""
       }
     },
@@ -23968,7 +23968,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "涡轮模式: ",
         "zh_TW": ""
       }
     },
@@ -23993,7 +23993,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "涡轮模式热键。\n可以在 Ryujinx CPU 设置中配置涡轮模式的行为。\n\n如果不确定请保留为未绑定。",
         "zh_TW": ""
       }
     },
@@ -24018,7 +24018,7 @@
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
-        "zh_CN": "",
+        "zh_CN": "仅在按下时",
         "zh_TW": ""
       }
     },