forked from MeloNX/MeloNX
fix rebase
This commit is contained in:
parent
6dda8d1125
commit
910cf6c63c
@ -244,8 +244,6 @@ namespace LibRyujinx
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Translator.IsReadyForTranslation.Reset();
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
using ARMeilleure.Translation;
|
using ARMeilleure.Translation;
|
||||||
using LibHac.Bcat;
|
using LibHac.Bcat;
|
||||||
using LibRyujinx.Shared;
|
using LibRyujinx.Shared;
|
||||||
using OpenTK.Graphics.OpenGL;
|
using OpenTK.Graphics.OpenGL;
|
||||||
@ -171,7 +171,6 @@ namespace LibRyujinx
|
|||||||
_gpuDoneEvent.Reset();
|
_gpuDoneEvent.Reset();
|
||||||
device.Gpu.SetGpuThread();
|
device.Gpu.SetGpuThread();
|
||||||
device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
|
device.Gpu.InitializeShaderCache(_gpuCancellationTokenSource.Token);
|
||||||
Translator.IsReadyForTranslation.Set();
|
|
||||||
|
|
||||||
_isActive = true;
|
_isActive = true;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
using ARMeilleure.Signal;
|
|
||||||
using Ryujinx.Cpu.Jit;
|
|
||||||
using Ryujinx.Common;
|
using Ryujinx.Common;
|
||||||
|
using Ryujinx.Cpu.Jit;
|
||||||
|
using Ryujinx.Cpu.Signal;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -80,8 +80,6 @@ namespace Ryujinx.Cpu.Nce
|
|||||||
|
|
||||||
MemoryBlock codeBlock = null;
|
MemoryBlock codeBlock = null;
|
||||||
|
|
||||||
NativeSignalHandler.Initialize(new JitMemoryAllocator());
|
|
||||||
|
|
||||||
NativeSignalHandler.InitializeSignalHandler(MemoryBlock.GetPageSize(), (IntPtr oldSignalHandlerSegfaultPtr, IntPtr signalHandlerPtr) =>
|
NativeSignalHandler.InitializeSignalHandler(MemoryBlock.GetPageSize(), (IntPtr oldSignalHandlerSegfaultPtr, IntPtr signalHandlerPtr) =>
|
||||||
{
|
{
|
||||||
uint[] ehWrapperCode = NcePatcher.GenerateWrapperExceptionHandler(oldSignalHandlerSegfaultPtr, signalHandlerPtr);
|
uint[] ehWrapperCode = NcePatcher.GenerateWrapperExceptionHandler(oldSignalHandlerSegfaultPtr, signalHandlerPtr);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using ARMeilleure.Signal;
|
|
||||||
using ARMeilleure.State;
|
using ARMeilleure.State;
|
||||||
|
using Ryujinx.Cpu.Signal;
|
||||||
using Ryujinx.Memory;
|
using Ryujinx.Memory;
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
@ -171,4 +171,4 @@ namespace Ryujinx.Cpu.Nce
|
|||||||
_context.Dispose();
|
_context.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user