JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-04-24 15:42:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDK20 and REV15 support (ryubing/ryujinx!50)

Browse Source 
See merge request ryubing/ryujinx!50
This commit is contained in:
LotP
2025-10-11 02:11:39 -05:00
committed by GreemDev
parent 4444ecae41
commit e2143d43bc
83 changed files with 2343 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Ryujinx.Audio/Renderer/Server/Mix/MixContext.cs
View File

@@ -17,12 +17,12 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
private uint _mixesCount;
/// <summary>
/// Storage for <see cref="MixState"/>.
/// Storage for <see cref="MixInfo"/>.
/// </summary>
private Memory<MixState> _mixes;
private Memory<MixInfo> _mixes;
/// <summary>
/// Storage of the sorted indices to <see cref="MixState"/>.
/// Storage of the sorted indices to <see cref="MixInfo"/>.
/// </summary>
private Memory<int> _sortedMixes;
@@ -49,10 +49,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
/// Initialize the <see cref="MixContext"/>.
/// </summary>
/// <param name="sortedMixes">The storage for sorted indices.</param>
/// <param name="mixes">The storage of <see cref="MixState"/>.</param>
/// <param name="mixes">The storage of <see cref="MixInfo"/>.</param>
/// <param name="nodeStatesWorkBuffer">The storage used for the <see cref="NodeStates"/>.</param>
/// <param name="edgeMatrixWorkBuffer">The storage used for the <see cref="EdgeMatrix"/>.</param>
public void Initialize(Memory<int> sortedMixes, Memory<MixState> mixes, Memory<byte> nodeStatesWorkBuffer, Memory<byte> edgeMatrixWorkBuffer)
public void Initialize(Memory<int> sortedMixes, Memory<MixInfo> mixes, Memory<byte> nodeStatesWorkBuffer, Memory<byte> edgeMatrixWorkBuffer)
{
_mixesCount = (uint)mixes.Length;
_mixes = mixes;
@@ -82,30 +82,30 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
}
/// <summary>
/// Get a reference to the final <see cref="MixState"/>.
/// Get a reference to the final <see cref="MixInfo"/>.
/// </summary>
/// <returns>A reference to the final <see cref="MixState"/>.</returns>
public ref MixState GetFinalState()
/// <returns>A reference to the final <see cref="MixInfo"/>.</returns>
public ref MixInfo GetFinalState()
{
return ref GetState(Constants.FinalMixId);
}
/// <summary>
/// Get a reference to a <see cref="MixState"/> at the given <paramref name="id"/>.
/// Get a reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.
/// </summary>
/// <param name="id">The index to use.</param>
/// <returns>A reference to a <see cref="MixState"/> at the given <paramref name="id"/>.</returns>
public ref MixState GetState(int id)
/// <returns>A reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.</returns>
public ref MixInfo GetState(int id)
{
return ref SpanIOHelper.GetFromMemory(_mixes, id, _mixesCount);
}
/// <summary>
/// Get a reference to a <see cref="MixState"/> at the given <paramref name="id"/> of the sorted mix info.
/// Get a reference to a <see cref="MixInfo"/> at the given <paramref name="id"/> of the sorted mix info.
/// </summary>
/// <param name="id">The index to use.</param>
/// <returns>A reference to a <see cref="MixState"/> at the given <paramref name="id"/>.</returns>
public ref MixState GetSortedState(int id)
/// <returns>A reference to a <see cref="MixInfo"/> at the given <paramref name="id"/>.</returns>
public ref MixInfo GetSortedState(int id)
{
Debug.Assert(id >= 0 && id < _mixesCount);
@@ -122,18 +122,18 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
}
/// <summary>
/// Update the internal distance from the final mix value of every <see cref="MixState"/>.
/// Update the internal distance from the final mix value of every <see cref="MixInfo"/>.
/// </summary>
private void UpdateDistancesFromFinalMix()
{
foreach (ref MixState mix in _mixes.Span)
foreach (ref MixInfo mix in _mixes.Span)
{
mix.ClearDistanceFromFinalMix();
}
for (int i = 0; i < GetCount(); i++)
{
ref MixState mix = ref GetState(i);
ref MixInfo mix = ref GetState(i);
SetSortedState(i, i);
@@ -149,13 +149,13 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
{
if (mixId == Constants.UnusedMixId)
{
distance = MixState.InvalidDistanceFromFinalMix;
distance = MixInfo.InvalidDistanceFromFinalMix;
break;
}
ref MixState distanceMix = ref GetState(mixId);
ref MixInfo distanceMix = ref GetState(mixId);
if (distanceMix.DistanceFromFinalMix != MixState.InvalidDistanceFromFinalMix)
if (distanceMix.DistanceFromFinalMix != MixInfo.InvalidDistanceFromFinalMix)
{
distance = distanceMix.DistanceFromFinalMix + 1;
break;
@@ -171,12 +171,12 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
if (distance > GetCount())
{
distance = MixState.InvalidDistanceFromFinalMix;
distance = MixInfo.InvalidDistanceFromFinalMix;
}
}
else
{
distance = MixState.InvalidDistanceFromFinalMix;
distance = MixInfo.InvalidDistanceFromFinalMix;
}
mix.DistanceFromFinalMix = distance;
@@ -185,13 +185,13 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
}
/// <summary>
/// Update the internal mix buffer offset of all <see cref="MixState"/>.
/// Update the internal mix buffer offset of all <see cref="MixInfo"/>.
/// </summary>
private void UpdateMixBufferOffset()
{
uint offset = 0;
foreach (ref MixState mix in _mixes.Span)
foreach (ref MixInfo mix in _mixes.Span)
{
mix.BufferOffset = offset;
@@ -210,10 +210,10 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
Array.Sort(sortedMixesTemp, (a, b) =>
{
ref MixState stateA = ref GetState(a);
ref MixState stateB = ref GetState(b);
ref MixInfo infoA = ref GetState(a);
ref MixInfo infoB = ref GetState(b);
return stateB.DistanceFromFinalMix.CompareTo(stateA.DistanceFromFinalMix);
return infoB.DistanceFromFinalMix.CompareTo(infoA.DistanceFromFinalMix);
});
sortedMixesTemp.AsSpan().CopyTo(_sortedMixes.Span);

21
src/Ryujinx.Audio/Renderer/Server/Mix/MixState.cs → src/Ryujinx.Audio/Renderer/Server/Mix/MixInfo.cs
View File

@@ -15,7 +15,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
/// Server state for a mix.
/// </summary>
[StructLayout(LayoutKind.Sequential, Size = 0x940, Pack = Alignment)]
public struct MixState
public struct MixInfo
{
public const uint InvalidDistanceFromFinalMix = 0x80000000;
@@ -136,11 +136,11 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
}
/// <summary>
/// Create a new <see cref="MixState"/>
/// Create a new <see cref="MixInfo"/>
/// </summary>
/// <param name="effectProcessingOrderArray"></param>
/// <param name="behaviourContext"></param>
public MixState(Memory<int> effectProcessingOrderArray, ref BehaviourContext behaviourContext) : this()
/// <param name="behaviourInfo"></param>
public MixInfo(Memory<int> effectProcessingOrderArray, ref BehaviourInfo behaviourInfo) : this()
{
MixId = UnusedMixId;
@@ -158,7 +158,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
EffectProcessingOrderArrayMaxCount = (uint)effectProcessingOrderArray.Length;
IsLongSizePreDelaySupported = behaviourContext.IsLongSizePreDelaySupported();
IsLongSizePreDelaySupported = behaviourInfo.IsLongSizePreDelaySupported();
ClearEffectProcessingOrder();
}
@@ -257,9 +257,9 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
/// <param name="parameter">The input parameter of the mix.</param>
/// <param name="effectContext">The effect context.</param>
/// <param name="splitterContext">The splitter context.</param>
/// <param name="behaviourContext">The behaviour context.</param>
/// <param name="behaviourInfo">The behaviour context.</param>
/// <returns>Return true if the mix was changed.</returns>
public bool Update(EdgeMatrix edgeMatrix, in MixParameter parameter, EffectContext effectContext, SplitterContext splitterContext, BehaviourContext behaviourContext)
public bool Update(EdgeMatrix edgeMatrix, in MixParameter parameter, EffectContext effectContext, SplitterContext splitterContext, BehaviourInfo behaviourInfo)
{
bool isDirty;
@@ -271,7 +271,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
NodeId = parameter.NodeId;
parameter.MixBufferVolume.CopyTo(MixBufferVolume);
if (behaviourContext.IsSplitterSupported())
if (behaviourInfo.IsSplitterSupported())
{
isDirty = UpdateConnection(edgeMatrix, in parameter, ref splitterContext);
}
@@ -279,10 +279,7 @@ namespace Ryujinx.Audio.Renderer.Server.Mix
{
isDirty = DestinationMixId != parameter.DestinationMixId;
if (DestinationMixId != parameter.DestinationMixId)
{
DestinationMixId = parameter.DestinationMixId;
}
DestinationMixId = parameter.DestinationMixId;
DestinationSplitterId = UnusedSplitterId;
}