diff options
| author | Thog <me@thog.eu> | 2020-04-25 16:17:22 +0200 |
|---|---|---|
| committer | Thog <me@thog.eu> | 2020-04-25 16:17:22 +0200 |
| commit | 3dfa4232f839ee9e1d6e00cf8dc4ba1f4b0943cf (patch) | |
| tree | de3f22444e1a0d0f645f7cef03ec0a0f8af6a807 | |
| parent | 9261ec6bc858948c7ba73e1ff1301e19623be933 (diff) | |
Fix building of previous commit
| -rw-r--r-- | Ryujinx.Graphics.Gpu/NvGpuFifo.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.Graphics.Gpu/State/GpuState.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Ryujinx.Graphics.Gpu/NvGpuFifo.cs b/Ryujinx.Graphics.Gpu/NvGpuFifo.cs index 7628fe6b..e1b9a61b 100644 --- a/Ryujinx.Graphics.Gpu/NvGpuFifo.cs +++ b/Ryujinx.Graphics.Gpu/NvGpuFifo.cs @@ -192,7 +192,7 @@ namespace Ryujinx.Graphics.Gpu else if (meth.Method < 0x60) { // TODO: check if macros are shared between subchannels or not. For now let's assume they are. - _fifoChannel.State.CallMethod(meth); + _fifoChannel.State.CallMethod(meth, _shadowCtrl); } else if (meth.Method < 0xe00) { diff --git a/Ryujinx.Graphics.Gpu/State/GpuState.cs b/Ryujinx.Graphics.Gpu/State/GpuState.cs index fb495eff..677fed66 100644 --- a/Ryujinx.Graphics.Gpu/State/GpuState.cs +++ b/Ryujinx.Graphics.Gpu/State/GpuState.cs @@ -132,7 +132,7 @@ namespace Ryujinx.Graphics.Gpu.State /// <summary> /// Initializes registers with the default state. /// </summary> - private static void InitializeDefaultState(int[] memory) + private void InitializeDefaultState(int[] memory) { // Enable Rasterizer memory[(int)MethodOffset.RasterizeEnable] = 1; @@ -151,7 +151,7 @@ namespace Ryujinx.Graphics.Gpu.State memory[0x4e7] = 0xff; // Conditional rendering condition. - _backingMemory[0x556] = (int)Condition.Always; + memory[0x556] = (int)Condition.Always; // Default color mask. for (int index = 0; index < Constants.TotalRenderTargets; index++) @@ -390,7 +390,7 @@ namespace Ryujinx.Graphics.Gpu.State public void Set<T>(MethodOffset offset, T data) where T : struct { ReadOnlySpan<int> intSpan = MemoryMarshal.Cast<T, int>(MemoryMarshal.CreateReadOnlySpan(ref data, 1)); - intSpan.CopyTo(_backingMemory.AsSpan().Slice((int)offset, intSpan.Length)); + intSpan.CopyTo(_memory.AsSpan().Slice((int)offset, intSpan.Length)); } } } |