emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix building of previous commit

Browse source
This commit is contained in:
Thog 2020-04-25 16:17:22 +02:00
parent 9261ec6bc8
commit 3dfa4232f8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.Graphics.Gpu/NvGpuFifo.cs
View file

@ -192,7 +192,7 @@ namespace Ryujinx.Graphics.Gpu
else if (meth.Method < 0x60) else if (meth.Method < 0x60)
{ {
// TODO: check if macros are shared between subchannels or not. For now let's assume they are. // 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) else if (meth.Method < 0xe00)
{ {

6
Ryujinx.Graphics.Gpu/State/GpuState.cs
View file

@ -132,7 +132,7 @@ namespace Ryujinx.Graphics.Gpu.State
/// <summary> /// <summary>
/// Initializes registers with the default state. /// Initializes registers with the default state.
/// </summary> /// </summary>
private static void InitializeDefaultState(int[] memory) private void InitializeDefaultState(int[] memory)
{ {
// Enable Rasterizer // Enable Rasterizer
memory[(int)MethodOffset.RasterizeEnable] = 1; memory[(int)MethodOffset.RasterizeEnable] = 1;
@ -151,7 +151,7 @@ namespace Ryujinx.Graphics.Gpu.State
memory[0x4e7] = 0xff; memory[0x4e7] = 0xff;
// Conditional rendering condition. // Conditional rendering condition.
_backingMemory[0x556] = (int)Condition.Always; memory[0x556] = (int)Condition.Always;
// Default color mask. // Default color mask.
for (int index = 0; index < Constants.TotalRenderTargets; index++) 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 public void Set<T>(MethodOffset offset, T data) where T : struct
{ {
ReadOnlySpan<int> intSpan = MemoryMarshal.Cast<T, int>(MemoryMarshal.CreateReadOnlySpan(ref data, 1)); 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));
} }
} }
} }