mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-10 09:48:51 +02:00
Implement MME shadow RAM (#987)
This commit is contained in:
parent
d904706fc0
commit
ff2bac9c90
4 changed files with 90 additions and 20 deletions
|
@ -45,7 +45,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
BitwiseNotAnd = 12
|
BitwiseNotAnd = 12
|
||||||
}
|
}
|
||||||
|
|
||||||
public Queue<int> Fifo { get; private set; }
|
public Queue<int> Fifo { get; }
|
||||||
|
|
||||||
private int[] _gprs;
|
private int[] _gprs;
|
||||||
|
|
||||||
|
@ -62,6 +62,8 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
|
|
||||||
private int _pc;
|
private int _pc;
|
||||||
|
|
||||||
|
private ShadowRamControl _shadowCtrl;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates a new instance of the macro code interpreter.
|
/// Creates a new instance of the macro code interpreter.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -78,8 +80,10 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
/// <param name="mme">Code of the program to execute</param>
|
/// <param name="mme">Code of the program to execute</param>
|
||||||
/// <param name="position">Start position to execute</param>
|
/// <param name="position">Start position to execute</param>
|
||||||
/// <param name="param">Optional argument passed to the program, 0 if not used</param>
|
/// <param name="param">Optional argument passed to the program, 0 if not used</param>
|
||||||
|
/// <param name="shadowCtrl">Shadow RAM control register value</param>
|
||||||
/// <param name="state">Current GPU state</param>
|
/// <param name="state">Current GPU state</param>
|
||||||
public void Execute(int[] mme, int position, int param, GpuState state)
|
/// <param name="shadowState">Shadow GPU state</param>
|
||||||
|
public void Execute(int[] mme, int position, int param, ShadowRamControl shadowCtrl, GpuState state, GpuState shadowState)
|
||||||
{
|
{
|
||||||
Reset();
|
Reset();
|
||||||
|
|
||||||
|
@ -87,13 +91,15 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
|
|
||||||
_pc = position;
|
_pc = position;
|
||||||
|
|
||||||
|
_shadowCtrl = shadowCtrl;
|
||||||
|
|
||||||
FetchOpCode(mme);
|
FetchOpCode(mme);
|
||||||
|
|
||||||
while (Step(mme, state));
|
while (Step(mme, state, shadowState));
|
||||||
|
|
||||||
// Due to the delay slot, we still need to execute
|
// Due to the delay slot, we still need to execute
|
||||||
// one more instruction before we actually exit.
|
// one more instruction before we actually exit.
|
||||||
Step(mme, state);
|
Step(mme, state, shadowState);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -118,8 +124,9 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="mme">Program code to execute</param>
|
/// <param name="mme">Program code to execute</param>
|
||||||
/// <param name="state">Current GPU state</param>
|
/// <param name="state">Current GPU state</param>
|
||||||
|
/// <param name="shadowState">Shadow GPU state</param>
|
||||||
/// <returns>True to continue execution, false if the program exited</returns>
|
/// <returns>True to continue execution, false if the program exited</returns>
|
||||||
private bool Step(int[] mme, GpuState state)
|
private bool Step(int[] mme, GpuState state, GpuState shadowState)
|
||||||
{
|
{
|
||||||
int baseAddr = _pc - 1;
|
int baseAddr = _pc - 1;
|
||||||
|
|
||||||
|
@ -165,7 +172,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
{
|
{
|
||||||
SetDstGpr(FetchParam());
|
SetDstGpr(FetchParam());
|
||||||
|
|
||||||
Send(state, result);
|
Send(state, shadowState, result);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -175,7 +182,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
{
|
{
|
||||||
SetDstGpr(result);
|
SetDstGpr(result);
|
||||||
|
|
||||||
Send(state, result);
|
Send(state, shadowState, result);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -197,7 +204,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
|
|
||||||
SetMethAddr(result);
|
SetMethAddr(result);
|
||||||
|
|
||||||
Send(state, FetchParam());
|
Send(state, shadowState, FetchParam());
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -209,7 +216,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
|
|
||||||
SetMethAddr(result);
|
SetMethAddr(result);
|
||||||
|
|
||||||
Send(state, (result >> 12) & 0x3f);
|
Send(state, shadowState,(result >> 12) & 0x3f);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -482,9 +489,21 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
/// Performs a GPU method call.
|
/// Performs a GPU method call.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="state">Current GPU state</param>
|
/// <param name="state">Current GPU state</param>
|
||||||
|
/// <param name="shadowState">Shadow GPU state</param>
|
||||||
/// <param name="value">Call argument</param>
|
/// <param name="value">Call argument</param>
|
||||||
private void Send(GpuState state, int value)
|
private void Send(GpuState state, GpuState shadowState, int value)
|
||||||
{
|
{
|
||||||
|
// TODO: Figure out what TrackWithFilter does, compared to Track.
|
||||||
|
if (_shadowCtrl == ShadowRamControl.Track ||
|
||||||
|
_shadowCtrl == ShadowRamControl.TrackWithFilter)
|
||||||
|
{
|
||||||
|
shadowState.Write(_methAddr, value);
|
||||||
|
}
|
||||||
|
else if (_shadowCtrl == ShadowRamControl.Replay)
|
||||||
|
{
|
||||||
|
value = shadowState.Read(_methAddr);
|
||||||
|
}
|
||||||
|
|
||||||
MethodParams meth = new MethodParams(_methAddr, value);
|
MethodParams meth = new MethodParams(_methAddr, value);
|
||||||
|
|
||||||
state.CallMethod(meth);
|
state.CallMethod(meth);
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using Ryujinx.Graphics.Gpu.State;
|
using Ryujinx.Graphics.Gpu.State;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Gpu
|
namespace Ryujinx.Graphics.Gpu
|
||||||
{
|
{
|
||||||
|
@ -61,13 +62,13 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="mme">Program code</param>
|
/// <param name="mme">Program code</param>
|
||||||
/// <param name="state">Current GPU state</param>
|
/// <param name="state">Current GPU state</param>
|
||||||
public void Execute(int[] mme, GpuState state)
|
public void Execute(int[] mme, ShadowRamControl shadowCtrl, GpuState state, GpuState shadowState)
|
||||||
{
|
{
|
||||||
if (_executionPending)
|
if (_executionPending)
|
||||||
{
|
{
|
||||||
_executionPending = false;
|
_executionPending = false;
|
||||||
|
|
||||||
_interpreter?.Execute(mme, Position, _argument, state);
|
_interpreter?.Execute(mme, Position, _argument, shadowCtrl, state, shadowState);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,6 +85,8 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
private int _currMacroPosition;
|
private int _currMacroPosition;
|
||||||
private int _currMacroBindIndex;
|
private int _currMacroBindIndex;
|
||||||
|
|
||||||
|
private ShadowRamControl _shadowCtrl;
|
||||||
|
|
||||||
private CachedMacro[] _macros;
|
private CachedMacro[] _macros;
|
||||||
|
|
||||||
private int[] _mme;
|
private int[] _mme;
|
||||||
|
@ -98,6 +101,11 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public GpuState State { get; }
|
public GpuState State { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sub-channel shadow GPU state (used as backup storage to restore MME changes).
|
||||||
|
/// </summary>
|
||||||
|
public GpuState ShadowState { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Engine bound to the sub-channel.
|
/// Engine bound to the sub-channel.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -109,6 +117,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
public SubChannel()
|
public SubChannel()
|
||||||
{
|
{
|
||||||
State = new GpuState();
|
State = new GpuState();
|
||||||
|
ShadowState = new GpuState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -188,11 +197,22 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NvGpuFifoMeth.SetMmeShadowRamControl:
|
||||||
|
{
|
||||||
|
_shadowCtrl = (ShadowRamControl)meth.Argument;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (meth.Method < 0xe00)
|
else if (meth.Method < 0xe00)
|
||||||
{
|
{
|
||||||
_subChannels[meth.SubChannel].State.CallMethod(meth);
|
SubChannel sc = _subChannels[meth.SubChannel];
|
||||||
|
|
||||||
|
sc.ShadowState.Write(meth.Method, meth.Argument);
|
||||||
|
|
||||||
|
sc.State.CallMethod(meth);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -209,7 +229,9 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
|
|
||||||
if (meth.IsLastCall)
|
if (meth.IsLastCall)
|
||||||
{
|
{
|
||||||
_macros[macroIndex].Execute(_mme, _subChannels[meth.SubChannel].State);
|
SubChannel sc = _subChannels[meth.SubChannel];
|
||||||
|
|
||||||
|
_macros[macroIndex].Execute(_mme, _shadowCtrl, sc.State, sc.ShadowState);
|
||||||
|
|
||||||
_context.Methods.PerformDeferredDraws();
|
_context.Methods.PerformDeferredDraws();
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ namespace Ryujinx.Graphics.Gpu
|
||||||
SetMacroUploadAddress = 0x45,
|
SetMacroUploadAddress = 0x45,
|
||||||
SendMacroCodeData = 0x46,
|
SendMacroCodeData = 0x46,
|
||||||
SetMacroBindingIndex = 0x47,
|
SetMacroBindingIndex = 0x47,
|
||||||
BindMacro = 0x48
|
BindMacro = 0x48,
|
||||||
|
SetMmeShadowRamControl = 0x49
|
||||||
}
|
}
|
||||||
}
|
}
|
28
Ryujinx.Graphics.Gpu/ShadowRamControl.cs
Normal file
28
Ryujinx.Graphics.Gpu/ShadowRamControl.cs
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
namespace Ryujinx.Graphics.Gpu
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Shadow RAM Control setting.
|
||||||
|
/// </summary>
|
||||||
|
enum ShadowRamControl
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Track data writes and store them on shadow RAM.
|
||||||
|
/// </summary>
|
||||||
|
Track = 0,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Track data writes and store them on shadow RAM, with filtering.
|
||||||
|
/// </summary>
|
||||||
|
TrackWithFilter = 1,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Writes data directly without storing on shadow RAM.
|
||||||
|
/// </summary>
|
||||||
|
Passthrough = 2,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Ignore data being written and replace with data on shadow RAM instead.
|
||||||
|
/// </summary>
|
||||||
|
Replay = 3
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue