emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix dimensions check for scale eligibility (#2301)

Browse source
This commit is contained in:
riperiperi 2021-05-21 00:09:18 +01:00 committed by GitHub
parent 12533e5c9d
commit 5271cfe70b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 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> /// <summary>
/// Version of the codegen (to be changed when codegen or guest format change). /// Version of the codegen (to be changed when codegen or guest format change).
/// </summary> /// </summary>
private const ulong ShaderCodeGenVersion = 2300; private const ulong ShaderCodeGenVersion = 2301;
// Progress reporting helpers // Progress reporting helpers
private volatile int _shaderCount; private volatile int _shaderCount;

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

@ -257,7 +257,6 @@ namespace Ryujinx.Graphics.Shader.Translation
bool accurateType) bool accurateType)
{ {
var dimensions = type.GetDimensions(); var dimensions = type.GetDimensions();
var isArray = type.HasFlag(SamplerType.Array);
var isIndexed = type.HasFlag(SamplerType.Indexed); var isIndexed = type.HasFlag(SamplerType.Indexed);
var usageFlags = TextureUsageFlags.None; var usageFlags = TextureUsageFlags.None;
@ -266,9 +265,7 @@ namespace Ryujinx.Graphics.Shader.Translation
{ {
usageFlags |= TextureUsageFlags.NeedsScaleValue; usageFlags |= TextureUsageFlags.NeedsScaleValue;
var canScale = (Stage == ShaderStage.Fragment || Stage == ShaderStage.Compute) && !isIndexed && !write && var canScale = (Stage == ShaderStage.Fragment || Stage == ShaderStage.Compute) && !isIndexed && !write && dimensions == 2;
((dimensions == 2 && !isArray) ||
(dimensions == 3 && isArray));
if (!canScale) if (!canScale)
{ {