From 8c0b49299c4adc272eae160adfcb5af8fafdfd27 Mon Sep 17 00:00:00 2001
From: Gabriel A <gab.dark.100@gmail.com>
Date: Sat, 25 May 2024 19:59:54 -0300
Subject: [PATCH] Move bind extra sets logic to new method

---
 .../DescriptorSetUpdater.cs                   | 101 +++++++++---------
 1 file changed, 53 insertions(+), 48 deletions(-)

diff --git a/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs b/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
index bfe3cd7ada..c298263d36 100644
--- a/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
+++ b/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
@@ -636,7 +636,7 @@ namespace Ryujinx.Graphics.Vulkan
             {
                 if (program.UsePushDescriptors)
                 {
-                    UpdateAndBindUniformBufferPd(cbs, pbp);
+                    UpdateAndBindUniformBufferPd(cbs);
                 }
                 else
                 {
@@ -663,52 +663,7 @@ namespace Ryujinx.Graphics.Vulkan
             {
                 // Program is using extra sets, we need to bind those too.
 
-                for (int setIndex = PipelineBase.DescriptorSetLayouts; setIndex < program.BindingSegments.Length; setIndex++)
-                {
-                    var bindingSegments = program.BindingSegments[setIndex];
-
-                    if (bindingSegments.Length == 0)
-                    {
-                        continue;
-                    }
-
-                    ResourceBindingSegment segment = bindingSegments[0];
-
-                    if (segment.IsArray)
-                    {
-                        DescriptorSet[] sets = null;
-
-                        if (segment.Type == ResourceType.Texture ||
-                            segment.Type == ResourceType.Sampler ||
-                            segment.Type == ResourceType.TextureAndSampler ||
-                            segment.Type == ResourceType.BufferTexture)
-                        {
-                            sets = _textureArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts].Array.GetDescriptorSets(
-                                _device,
-                                cbs,
-                                _templateUpdater,
-                                program,
-                                setIndex,
-                                _dummyTexture,
-                                _dummySampler);
-                        }
-                        else if (segment.Type == ResourceType.Image || segment.Type == ResourceType.BufferImage)
-                        {
-                            sets = _imageArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts].Array.GetDescriptorSets(
-                                _device,
-                                cbs,
-                                _templateUpdater,
-                                program,
-                                setIndex,
-                                _dummyTexture);
-                        }
-
-                        if (sets != null)
-                        {
-                            _gd.Api.CmdBindDescriptorSets(cbs.CommandBuffer, pbp, _program.PipelineLayout, (uint)setIndex, 1, sets, 0, ReadOnlySpan<uint>.Empty);
-                        }
-                    }
-                }
+                BindExtraSets(cbs, program, pbp);
             }
 
             _dirty = DirtyFlags.None;
@@ -958,7 +913,7 @@ namespace Ryujinx.Graphics.Vulkan
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void UpdateAndBindUniformBufferPd(CommandBufferScoped cbs, PipelineBindPoint pbp)
+        private void UpdateAndBindUniformBufferPd(CommandBufferScoped cbs)
         {
             int sequence = _pdSequence;
             var bindingSegments = _program.BindingSegments[PipelineBase.UniformSetIndex];
@@ -1022,6 +977,56 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
+        private void BindExtraSets(CommandBufferScoped cbs, ShaderCollection program, PipelineBindPoint pbp)
+        {
+            for (int setIndex = PipelineBase.DescriptorSetLayouts; setIndex < program.BindingSegments.Length; setIndex++)
+                {
+                    var bindingSegments = program.BindingSegments[setIndex];
+
+                    if (bindingSegments.Length == 0)
+                    {
+                        continue;
+                    }
+
+                    ResourceBindingSegment segment = bindingSegments[0];
+
+                    if (segment.IsArray)
+                    {
+                        DescriptorSet[] sets = null;
+
+                        if (segment.Type == ResourceType.Texture ||
+                            segment.Type == ResourceType.Sampler ||
+                            segment.Type == ResourceType.TextureAndSampler ||
+                            segment.Type == ResourceType.BufferTexture)
+                        {
+                            sets = _textureArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts].Array.GetDescriptorSets(
+                                _device,
+                                cbs,
+                                _templateUpdater,
+                                program,
+                                setIndex,
+                                _dummyTexture,
+                                _dummySampler);
+                        }
+                        else if (segment.Type == ResourceType.Image || segment.Type == ResourceType.BufferImage)
+                        {
+                            sets = _imageArrayExtraRefs[setIndex - PipelineBase.DescriptorSetLayouts].Array.GetDescriptorSets(
+                                _device,
+                                cbs,
+                                _templateUpdater,
+                                program,
+                                setIndex,
+                                _dummyTexture);
+                        }
+
+                        if (sets != null)
+                        {
+                            _gd.Api.CmdBindDescriptorSets(cbs.CommandBuffer, pbp, _program.PipelineLayout, (uint)setIndex, 1, sets, 0, ReadOnlySpan<uint>.Empty);
+                        }
+                    }
+                }
+        }
+
         public void SignalCommandBufferChange()
         {
             _updateDescriptorCacheCbIndex = true;