MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Fix logic surrounding PushDescriptors in Vulkan #257

Merged
gr3ger merged 3 commits from vk_fixes into master 2024-11-28 23:00:12 +00:00
Conversation 1 Commits 3 Files Changed 1 +10 -6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15b4d4c5e3 - Show all commits

16
src/Ryujinx.Graphics.Vulkan/ShaderCollection.cs
View File

@ -170,12 +170,6 @@ namespace Ryujinx.Graphics.Vulkan
bool hasBinding3 = uniformUsage.Any(x => x.Binding == 3); bool hasBinding3 = uniformUsage.Any(x => x.Binding == 3);
int[] reserved = isCompute ? Array.Empty<int>() : gd.GetPushDescriptorReservedBindings(hasBinding3); int[] reserved = isCompute ? Array.Empty<int>() : gd.GetPushDescriptorReservedBindings(hasBinding3);
//Prevent the sum of descriptors from exceeding MaxPushDescriptors
if (layout.Sets.First().Descriptors.Where(descriptor => !reserved.Contains(descriptor.Binding)).Sum(descriptor => descriptor.Count) > gd.Capabilities.MaxPushDescriptors)
{
return false;
}
// Can't use any of the reserved usages. // Can't use any of the reserved usages.
for (int i = 0; i < uniformUsage.Count; i++) for (int i = 0; i < uniformUsage.Count; i++)
{ {
@ -189,6 +183,16 @@ namespace Ryujinx.Graphics.Vulkan
} }
} }
//Prevent the sum of descriptors from exceeding MaxPushDescriptors
int totalDescriptors = 0;
foreach (ResourceDescriptor desc in layout.Sets.First().Descriptors)
{
if (!reserved.Contains(desc.Binding))
totalDescriptors += desc.Count;
}
if (totalDescriptors > gd.Capabilities.MaxPushDescriptors)
return false;
return true; return true;
} }