mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix buffer and texture uses not being propagated for vertex A/B shaders (#2300)

Browse source 
* Fix buffer and texture uses not being propagated for vertex A/B shaders

* Shader cache version bump
This commit is contained in:
gdkchan 2021-05-20 16:43:23 -03:00 committed by GitHub
parent b34c0a47b4
commit 12533e5c9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics.Gpu/Shader/ShaderCache.cs
View file

@ -36,7 +36,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <summary>
/// Version of the codegen (to be changed when codegen or guest format change).
/// </summary>
private const ulong ShaderCodeGenVersion = 2298;
private const ulong ShaderCodeGenVersion = 2300;
// Progress reporting helpers
private volatile int _shaderCount;

55
Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs
View file

@ -163,6 +163,34 @@ namespace Ryujinx.Graphics.Shader.Translation
Size += size;
}
public void InheritFrom(ShaderConfig other)
{
ClipDistancesWritten |= other.ClipDistancesWritten;
UsedFeatures |= other.UsedFeatures;
TextureHandlesForCache.UnionWith(other.TextureHandlesForCache);
_usedConstantBuffers |= other._usedConstantBuffers;
_usedStorageBuffers |= other._usedStorageBuffers;
_usedStorageBuffersWrite |= other._usedStorageBuffersWrite;
foreach (var kv in other._usedTextures)
{
if (!_usedTextures.TryAdd(kv.Key, kv.Value))
{
_usedTextures[kv.Key] = MergeTextureMeta(kv.Value, _usedTextures[kv.Key]);
}
}
foreach (var kv in other._usedImages)
{
if (!_usedImages.TryAdd(kv.Key, kv.Value))
{
_usedImages[kv.Key] = MergeTextureMeta(kv.Value, _usedImages[kv.Key]);
}
}
}
public void SetClipDistanceWritten(int index)
{
ClipDistancesWritten |= (byte)(1 << index);
@ -269,17 +297,7 @@ namespace Ryujinx.Graphics.Shader.Translation
if (dict.TryGetValue(info, out var existingMeta))
{
meta.UsageFlags |= existingMeta.UsageFlags;
// If the texture we have has inaccurate type information, then
// we prefer the most accurate one.
if (existingMeta.AccurateType)
{
meta.AccurateType = true;
meta.Type = existingMeta.Type;
}
dict[info] = meta;
dict[info] = MergeTextureMeta(meta, existingMeta);
}
else
{
@ -288,6 +306,21 @@ namespace Ryujinx.Graphics.Shader.Translation
}
}
private static TextureMeta MergeTextureMeta(TextureMeta meta, TextureMeta existingMeta)
{
meta.UsageFlags |= existingMeta.UsageFlags;
// If the texture we have has inaccurate type information, then
// we prefer the most accurate one.
if (existingMeta.AccurateType)
{
meta.AccurateType = true;
meta.Type = existingMeta.Type;
}
return meta;
}
public BufferDescriptor[] GetConstantBufferDescriptors()
{
if (_cachedConstantBufferDescriptors != null)

5
Ryujinx.Graphics.Shader/Translation/TranslatorContext.cs
View file

@ -132,10 +132,9 @@ namespace Ryujinx.Graphics.Shader.Translation
if (other != null)
{
_config.SetUsedFeature(other._config.UsedFeatures);
TextureHandlesForCache.UnionWith(other.TextureHandlesForCache);
code = Combine(EmitShader(other._cfg, other._config), code);
_config.InheritFrom(other._config);
}
return Translator.Translate(code, _config, out shaderProgramInfo);