manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-12 21:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

We only want separate sampler types for bindless resources

Browse source
This commit is contained in:
Gabriel A 2023-11-14 01:13:26 -03:00
parent 360630ad6b
commit 20a313ee15
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Ryujinx.Graphics.Shader/StructuredIr/ShaderProperties.cs
View file

@ -38,14 +38,14 @@ namespace Ryujinx.Graphics.Shader.StructuredIr
_storageBuffers[new(definition.Set, definition.Binding)] = definition; _storageBuffers[new(definition.Set, definition.Binding)] = definition;
} }
public void AddOrUpdateTexture(TextureDefinition definition) public void AddOrUpdateTexture(TextureDefinition definition, SamplerType type = SamplerType.None)
{ {
_textures[new(definition.Set, definition.Binding, definition.Type & ~(SamplerType.Shadow | SamplerType.Separate))] = definition; _textures[new(definition.Set, definition.Binding, type)] = definition;
} }
public void AddOrUpdateImage(TextureDefinition definition) public void AddOrUpdateImage(TextureDefinition definition, SamplerType type = SamplerType.None)
{ {
_images[new(definition.Set, definition.Binding, definition.Type & ~(SamplerType.Shadow | SamplerType.Separate))] = definition; _images[new(definition.Set, definition.Binding, type)] = definition;
} }
public int AddLocalMemory(MemoryDefinition definition) public int AddLocalMemory(MemoryDefinition definition)

2
src/Ryujinx.Graphics.Shader/Translation/ResourceManager.cs
View file

@ -195,7 +195,7 @@ namespace Ryujinx.Graphics.Shader.Translation
private void AddBindlessDefinition(int set, int binding, string name, SamplerType samplerType) private void AddBindlessDefinition(int set, int binding, string name, SamplerType samplerType)
{ {
TextureDefinition definition = new(set, binding, name, samplerType, TextureFormat.Unknown, TextureUsageFlags.None, 0); TextureDefinition definition = new(set, binding, name, samplerType, TextureFormat.Unknown, TextureUsageFlags.None, 0);
Properties.AddOrUpdateTexture(definition); Properties.AddOrUpdateTexture(definition, samplerType & ~(SamplerType.Separate | SamplerType.Shadow));
} }
private void AddBindlessSeparateDefinition(int set, int binding, string name, SamplerType samplerType) private void AddBindlessSeparateDefinition(int set, int binding, string name, SamplerType samplerType)