guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

Extend Adreno binding workaround to buffer textures

Browse Source
This commit is contained in:
Gabriel A 2023-08-21 19:39:25 -03:00 committed by Emmanuel Hansen
parent 698ac0413b
commit e3a81cfdee
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,10 +117,10 @@ namespace Ryujinx.Graphics.Vulkan
Stages = stages; Stages = stages;
bool hasBatchedTextureSamplerBug = gd.Vendor == Vendor.Qualcomm; bool hasBatchedTextureBug = gd.Vendor == Vendor.Qualcomm;
ClearSegments = BuildClearSegments(resourceLayout.Sets); ClearSegments = BuildClearSegments(resourceLayout.Sets);
BindingSegments = BuildBindingSegments(resourceLayout.SetUsages, hasBatchedTextureSamplerBug); BindingSegments = BuildBindingSegments(resourceLayout.SetUsages, hasBatchedTextureBug);
Templates = BuildTemplates(); Templates = BuildTemplates();
_compileTask = Task.CompletedTask; _compileTask = Task.CompletedTask;
@ -193,7 +193,7 @@ namespace Ryujinx.Graphics.Vulkan
return segments; return segments;
} }
private static ResourceBindingSegment[][] BuildBindingSegments(ReadOnlyCollection<ResourceUsageCollection> setUsages, bool hasBatchedTextureSamplerBug) private static ResourceBindingSegment[][] BuildBindingSegments(ReadOnlyCollection<ResourceUsageCollection> setUsages, bool hasBatchedTextureBug)
{ {
ResourceBindingSegment[][] segments = new ResourceBindingSegment[setUsages.Count][]; ResourceBindingSegment[][] segments = new ResourceBindingSegment[setUsages.Count][];
@ -210,7 +210,7 @@ namespace Ryujinx.Graphics.Vulkan
if (currentUsage.Binding + currentCount != usage.Binding || if (currentUsage.Binding + currentCount != usage.Binding ||
currentUsage.Type != usage.Type || currentUsage.Type != usage.Type ||
(currentUsage.Type == ResourceType.TextureAndSampler && hasBatchedTextureSamplerBug) || (IsReadOnlyTexture(currentUsage.Type) && hasBatchedTextureBug) ||
currentUsage.Stages != usage.Stages || currentUsage.Stages != usage.Stages ||
currentUsage.Access != usage.Access) currentUsage.Access != usage.Access)
{ {
@ -264,6 +264,11 @@ namespace Ryujinx.Graphics.Vulkan
return templates; return templates;
} }
private static bool IsReadOnlyTexture(ResourceType resourceType)
{
return resourceType == ResourceType.TextureAndSampler || resourceType == ResourceType.BufferTexture;
}
private async Task BackgroundCompilation() private async Task BackgroundCompilation()
{ {
await Task.WhenAll(_shaders.Select(shader => shader.CompileTask)); await Task.WhenAll(_shaders.Select(shader => shader.CompileTask));