diff options
Diffstat (limited to 'src/Ryujinx.Graphics.Gpu/Shader')
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs index 7f83f588..4b828080 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs @@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache private const ushort FileFormatVersionMajor = 1; private const ushort FileFormatVersionMinor = 2; private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor; - private const uint CodeGenVersion = 5027; + private const uint CodeGenVersion = 4992; private const string SharedTocFileName = "shared.toc"; private const string SharedDataFileName = "shared.data"; diff --git a/src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs b/src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs index 39b31cf6..3fc32d71 100644 --- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs +++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderInfoBuilder.cs @@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Gpu.Shader int imageBinding = stageIndex * imagesPerStage * 2; AddDescriptor(stages, ResourceType.UniformBuffer, UniformSetIndex, uniformBinding, uniformsPerStage); - AddArrayDescriptor(stages, ResourceType.StorageBuffer, StorageSetIndex, storageBinding, storagesPerStage); + AddDescriptor(stages, ResourceType.StorageBuffer, StorageSetIndex, storageBinding, storagesPerStage); AddDualDescriptor(stages, ResourceType.TextureAndSampler, ResourceType.BufferTexture, TextureSetIndex, textureBinding, texturesPerStage); AddDualDescriptor(stages, ResourceType.Image, ResourceType.BufferImage, ImageSetIndex, imageBinding, imagesPerStage); @@ -134,19 +134,6 @@ namespace Ryujinx.Graphics.Gpu.Shader } /// <summary> - /// Adds an array resource to the list of descriptors. - /// </summary> - /// <param name="stages">Shader stages where the resource is used</param> - /// <param name="type">Type of the resource</param> - /// <param name="setIndex">Descriptor set number where the resource will be bound</param> - /// <param name="binding">Binding number where the resource will be bound</param> - /// <param name="count">Number of resources bound at the binding location</param> - private void AddArrayDescriptor(ResourceStages stages, ResourceType type, int setIndex, int binding, int count) - { - _resourceDescriptors[setIndex].Add(new ResourceDescriptor(binding, count, type, stages)); - } - - /// <summary> /// Adds buffer usage information to the list of usages. /// </summary> /// <param name="buffers">Buffers to be added</param> |