manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-13 19:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor changes, remove debug log

Browse source
This commit is contained in:
riperiperi 2022-06-13 01:57:44 +01:00
parent d727e819af
commit 0f6c8f9cd9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx.Graphics.Gpu/Engine/Compute/ComputeClass.cs
View file

@ -237,7 +237,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Compute
_channel.TextureManager.SetComputeMaxBindings(maxTextureBinding, maxImageBinding); _channel.TextureManager.SetComputeMaxBindings(maxTextureBinding, maxImageBinding);
_channel.TextureManager.CommitComputeBindings(cs.SpecializationState); // Should be up to date, since the shader was fetched above. // Should never return false for mismatching spec state, since the shader was fetched above.
_channel.TextureManager.CommitComputeBindings(cs.SpecializationState);
_channel.BufferManager.CommitComputeBindings(); _channel.BufferManager.CommitComputeBindings();

2
Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
View file

@ -277,7 +277,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
if (!_channel.TextureManager.CommitGraphicsBindings(_shaderSpecState)) if (!_channel.TextureManager.CommitGraphicsBindings(_shaderSpecState))
{ {
Logger.Error?.Print(LogClass.Gpu, "Oh my"); // Shader must be reloaded.
UpdateShaderState(); UpdateShaderState();
} }

9
Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
View file

@ -469,7 +469,6 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// </summary> /// </summary>
/// <param name="channel">GPU channel</param> /// <param name="channel">GPU channel</param>
/// <param name="isCompute">Indicates whenever the check is requested by the 3D or compute engine</param> /// <param name="isCompute">Indicates whenever the check is requested by the 3D or compute engine</param>
/// <param name="stageIndex">Stage index of the constant buffer</param>
/// <param name="cachedTextureBufferIndex">The currently cached texture buffer index</param> /// <param name="cachedTextureBufferIndex">The currently cached texture buffer index</param>
/// <param name="cachedSamplerBufferIndex">The currently cached sampler buffer index</param> /// <param name="cachedSamplerBufferIndex">The currently cached sampler buffer index</param>
/// <param name="cachedTextureBuffer">The currently cached texture buffer data</param> /// <param name="cachedTextureBuffer">The currently cached texture buffer data</param>
@ -477,6 +476,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <param name="cachedStageIndex">The currently cached stage</param> /// <param name="cachedStageIndex">The currently cached stage</param>
/// <param name="textureBufferIndex">The new texture buffer index</param> /// <param name="textureBufferIndex">The new texture buffer index</param>
/// <param name="samplerBufferIndex">The new sampler buffer index</param> /// <param name="samplerBufferIndex">The new sampler buffer index</param>
/// <param name="stageIndex">Stage index of the constant buffer</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private void UpdateCachedBuffer( private void UpdateCachedBuffer(
GpuChannel channel, GpuChannel channel,
@ -578,10 +578,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
ref readonly Image.TextureDescriptor descriptor = ref pool.GetDescriptorRef(textureId); ref readonly Image.TextureDescriptor descriptor = ref pool.GetDescriptorRef(textureId);
Box<TextureSpecializationState> specializationState = kv.Value; if (!MatchesTexture(kv.Value, descriptor))
if (specializationState.Value.QueriedFlags.HasFlag(QueriedTextureStateFlags.CoordNormalized) &&
specializationState.Value.CoordNormalized != descriptor.UnpackTextureCoordNormalized())
{ {
return false; return false;
} }
@ -597,6 +594,8 @@ namespace Ryujinx.Graphics.Gpu.Shader
/// <param name="specializationState">Texture specialization state</param> /// <param name="specializationState">Texture specialization state</param>
/// <param name="descriptor">Texture descriptor</param> /// <param name="descriptor">Texture descriptor</param>
/// <returns>True if the state matches, false otherwise</returns> /// <returns>True if the state matches, false otherwise</returns>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private bool MatchesTexture(Box<TextureSpecializationState> specializationState, in Image.TextureDescriptor descriptor) private bool MatchesTexture(Box<TextureSpecializationState> specializationState, in Image.TextureDescriptor descriptor)
{ {
if (specializationState != null) if (specializationState != null)