From 3dfa4232f839ee9e1d6e00cf8dc4ba1f4b0943cf Mon Sep 17 00:00:00 2001 From: Thog Date: Sat, 25 Apr 2020 16:17:22 +0200 Subject: [PATCH] Fix building of previous commit --- Ryujinx.Graphics.Gpu/NvGpuFifo.cs | 2 +- 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 7628fe6bf..e1b9a61bc 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 fb495eff0..677fed660 100644 --- a/Ryujinx.Graphics.Gpu/State/GpuState.cs +++ b/Ryujinx.Graphics.Gpu/State/GpuState.cs @@ -132,7 +132,7 @@ namespace Ryujinx.Graphics.Gpu.State /// /// Initializes registers with the default state. /// - 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(MethodOffset offset, T data) where T : struct { ReadOnlySpan intSpan = MemoryMarshal.Cast(MemoryMarshal.CreateReadOnlySpan(ref data, 1)); - intSpan.CopyTo(_backingMemory.AsSpan().Slice((int)offset, intSpan.Length)); + intSpan.CopyTo(_memory.AsSpan().Slice((int)offset, intSpan.Length)); } } }