From 3063efaea16decb49ad330f4ff0dc569c18c19da Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 11 Jul 2023 02:50:40 +0300 Subject: [PATCH] Revert "Merge branch 'master' of https://github.com/SimoneN64/Panda3DS" This reverts commit 51fb4865ee715819ad6516dd37b248fe932b22c7, reversing changes made to de2751fb5c7aa5e6b7a2d74bccd1bde6b96c59bd. --- include/emulator.hpp | 3 +-- include/services/gsp_gpu.hpp | 1 - src/core/services/gsp_gpu.cpp | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/emulator.hpp b/include/emulator.hpp index e90a00a5..3985c613 100644 --- a/include/emulator.hpp +++ b/include/emulator.hpp @@ -47,7 +47,7 @@ class Emulator { static constexpr u32 width = 400; static constexpr u32 height = 240 * 2; // * 2 because 2 screens ROMType romType = ROMType::None; - bool running = true, romLoaded = false; + bool running = true; #ifdef PANDA3DS_ENABLE_HTTP_SERVER HttpServer httpServer; @@ -64,7 +64,6 @@ class Emulator { Emulator(); ~Emulator(); - void stop(); void step(); void render(); void reset(); diff --git a/include/services/gsp_gpu.hpp b/include/services/gsp_gpu.hpp index 00734458..7e69253a 100644 --- a/include/services/gsp_gpu.hpp +++ b/include/services/gsp_gpu.hpp @@ -22,7 +22,6 @@ enum class GPUInterrupt : u8 { class Kernel; class GPUService { - bool registerInterruptRelayQueueBeenHere = false; Handle handle = KernelHandles::GPU; Memory& mem; GPU& gpu; diff --git a/src/core/services/gsp_gpu.cpp b/src/core/services/gsp_gpu.cpp index fa18b761..5179aec8 100644 --- a/src/core/services/gsp_gpu.cpp +++ b/src/core/services/gsp_gpu.cpp @@ -35,7 +35,6 @@ void GPUService::reset() { interruptEvent = std::nullopt; gspThreadCount = 0; sharedMem = nullptr; - registerInterruptRelayQueueBeenHere = false; } void GPUService::handleSyncRequest(u32 messagePointer) {