crafterpika/MeloNX
0
0
Fork 0
mirror of https://git.743378673.xyz/MeloNX/MeloNX.git synced 2025-06-28 11:26:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix rebase

Browse source
This commit is contained in:
Emmanuel Hansen 2024-01-19 12:45:58 +00:00
parent aec0b99f8a
commit 15baf43a7c
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/LibRyujinx/LibRyujinx.Device.cs
View file

@ -244,8 +244,6 @@ namespace LibRyujinx
return false; return false;
} }
Translator.IsReadyForTranslation.Reset();
return true; return true;
} }

3
src/LibRyujinx/LibRyujinx.Graphics.cs
View file

@ -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;

6
src/Ryujinx.Cpu/Nce/NceCpuContext.cs
View file

@ -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);

2
src/Ryujinx.Cpu/Nce/NceExecutionContext.cs
View file

@ -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;