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

Fix resolution scale values not being updated (#3514)

Browse source
This commit is contained in:
gdkchan 2022-08-02 18:58:56 -03:00 committed by GitHub
parent ed0b10c81f
commit e235d5e7bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Ryujinx.Graphics.Gpu/Image/TextureBindingsManager.cs
View file

@ -50,8 +50,6 @@ namespace Ryujinx.Graphics.Gpu.Image
public int InvalidatedSequence; public int InvalidatedSequence;
public Texture CachedTexture; public Texture CachedTexture;
public Sampler CachedSampler; public Sampler CachedSampler;
public int ScaleIndex;
public TextureUsageFlags UsageFlags;
} }
private TextureState[] _textureState; private TextureState[] _textureState;
@ -535,14 +533,12 @@ namespace Ryujinx.Graphics.Gpu.Image
// The texture is already bound. // The texture is already bound.
state.CachedTexture.SynchronizeMemory(); state.CachedTexture.SynchronizeMemory();
if ((state.ScaleIndex != index || state.UsageFlags != usageFlags) && if ((usageFlags & TextureUsageFlags.NeedsScaleValue) != 0 &&
UpdateScale(state.CachedTexture, usageFlags, index, stage)) UpdateScale(state.CachedTexture, usageFlags, index, stage))
{ {
ITexture hostTextureRebind = state.CachedTexture.GetTargetTexture(bindingInfo.Target); ITexture hostTextureRebind = state.CachedTexture.GetTargetTexture(bindingInfo.Target);
state.Texture = hostTextureRebind; state.Texture = hostTextureRebind;
state.ScaleIndex = index;
state.UsageFlags = usageFlags;
_context.Renderer.Pipeline.SetTextureAndSampler(stage, bindingInfo.Binding, hostTextureRebind, state.Sampler); _context.Renderer.Pipeline.SetTextureAndSampler(stage, bindingInfo.Binding, hostTextureRebind, state.Sampler);
} }
@ -573,7 +569,7 @@ namespace Ryujinx.Graphics.Gpu.Image
{ {
bool textureOrSamplerChanged = state.Texture != hostTexture || state.Sampler != hostSampler; bool textureOrSamplerChanged = state.Texture != hostTexture || state.Sampler != hostSampler;
if ((state.ScaleIndex != index || state.UsageFlags != usageFlags || textureOrSamplerChanged) && if ((usageFlags & TextureUsageFlags.NeedsScaleValue) != 0 &&
UpdateScale(texture, usageFlags, index, stage)) UpdateScale(texture, usageFlags, index, stage))
{ {
hostTexture = texture?.GetTargetTexture(bindingInfo.Target); hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
@ -583,9 +579,6 @@ namespace Ryujinx.Graphics.Gpu.Image
if (textureOrSamplerChanged) if (textureOrSamplerChanged)
{ {
state.Texture = hostTexture; state.Texture = hostTexture;
state.ScaleIndex = index;
state.UsageFlags = usageFlags;
state.Sampler = hostSampler; state.Sampler = hostSampler;
_context.Renderer.Pipeline.SetTextureAndSampler(stage, bindingInfo.Binding, hostTexture, hostSampler); _context.Renderer.Pipeline.SetTextureAndSampler(stage, bindingInfo.Binding, hostTexture, hostSampler);
@ -666,7 +659,7 @@ namespace Ryujinx.Graphics.Gpu.Image
cachedTexture?.SignalModified(); cachedTexture?.SignalModified();
} }
if ((state.ScaleIndex != scaleIndex || state.UsageFlags != usageFlags) && if ((usageFlags & TextureUsageFlags.NeedsScaleValue) != 0 &&
UpdateScale(state.CachedTexture, usageFlags, scaleIndex, stage)) UpdateScale(state.CachedTexture, usageFlags, scaleIndex, stage))
{ {
ITexture hostTextureRebind = state.CachedTexture.GetTargetTexture(bindingInfo.Target); ITexture hostTextureRebind = state.CachedTexture.GetTargetTexture(bindingInfo.Target);
@ -674,8 +667,6 @@ namespace Ryujinx.Graphics.Gpu.Image
Format format = bindingInfo.Format == 0 ? cachedTexture.Format : bindingInfo.Format; Format format = bindingInfo.Format == 0 ? cachedTexture.Format : bindingInfo.Format;
state.Texture = hostTextureRebind; state.Texture = hostTextureRebind;
state.ScaleIndex = scaleIndex;
state.UsageFlags = usageFlags;
_context.Renderer.Pipeline.SetImage(bindingInfo.Binding, hostTextureRebind, format); _context.Renderer.Pipeline.SetImage(bindingInfo.Binding, hostTextureRebind, format);
} }
@ -713,7 +704,7 @@ namespace Ryujinx.Graphics.Gpu.Image
texture?.SignalModified(); texture?.SignalModified();
} }
if ((state.ScaleIndex != scaleIndex || state.UsageFlags != usageFlags || state.Texture != hostTexture) && if ((usageFlags & TextureUsageFlags.NeedsScaleValue) != 0 &&
UpdateScale(texture, usageFlags, scaleIndex, stage)) UpdateScale(texture, usageFlags, scaleIndex, stage))
{ {
hostTexture = texture?.GetTargetTexture(bindingInfo.Target); hostTexture = texture?.GetTargetTexture(bindingInfo.Target);
@ -722,8 +713,6 @@ namespace Ryujinx.Graphics.Gpu.Image
if (state.Texture != hostTexture) if (state.Texture != hostTexture)
{ {
state.Texture = hostTexture; state.Texture = hostTexture;
state.ScaleIndex = scaleIndex;
state.UsageFlags = usageFlags;
Format format = bindingInfo.Format; Format format = bindingInfo.Format;