From 25a6a9f23d9eddc3dbbfb6f2d23b82a47b62ad02 Mon Sep 17 00:00:00 2001
From: Simone <simococo03@gmail.com>
Date: Thu, 18 Jan 2024 13:32:52 +0100
Subject: [PATCH] smaller fixes

---
 external/parallel-rdp/ParallelRDPWrapper.cpp | 5 -----
 external/parallel-rdp/ParallelRDPWrapper.hpp | 3 ++-
 src/backend/Core.cpp                         | 1 +
 src/backend/core/Mem.cpp                     | 2 ++
 src/frontend/KaizenQt.cpp                    | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/external/parallel-rdp/ParallelRDPWrapper.cpp b/external/parallel-rdp/ParallelRDPWrapper.cpp
index 6176df80..402c5133 100644
--- a/external/parallel-rdp/ParallelRDPWrapper.cpp
+++ b/external/parallel-rdp/ParallelRDPWrapper.cpp
@@ -184,11 +184,6 @@ void LoadParallelRDP(const u8* rdram) {
   }
 }
 
-void InitParallelRDP(const u8* rdram, SDL_Window* window) {
-  LoadWSIPlatform(new SDLWSIPlatform(window), std::make_unique<SDLParallelRdpWindowInfo>(window));
-  LoadParallelRDP(rdram);
-}
-
 void DrawFullscreenTexturedQuad(Util::IntrusivePtr<Image> image, Util::IntrusivePtr<CommandBuffer> cmd) {
   cmd->set_texture(0, 0, image->get_view(), Vulkan::StockSampler::LinearClamp);
   cmd->set_program(fullscreen_quad_program);
diff --git a/external/parallel-rdp/ParallelRDPWrapper.hpp b/external/parallel-rdp/ParallelRDPWrapper.hpp
index 945285a2..8056e1f3 100644
--- a/external/parallel-rdp/ParallelRDPWrapper.hpp
+++ b/external/parallel-rdp/ParallelRDPWrapper.hpp
@@ -32,7 +32,8 @@ uint32_t GetVkGraphicsQueueFamily();
 VkFormat GetVkFormat();
 VkCommandBuffer GetVkCommandBuffer();
 void SubmitRequestedVkCommandBuffer();
-void InitParallelRDP(const u8* rdram, SDL_Window* window);
+void LoadParallelRDP(const u8* rdram);
+Vulkan::WSI* LoadWSIPlatform(Vulkan::WSIPlatform* wsi_platform, std::unique_ptr<ParallelRdpWindowInfo>&& newWindowInfo);
 void UpdateScreenParallelRdp(n64::Core& core, n64::VI& vi);
 void ParallelRdpEnqueueCommand(int command_length, u32* buffer);
 void ParallelRdpOnFullSync();
diff --git a/src/backend/Core.cpp b/src/backend/Core.cpp
index 9a1dada9..484b9dab 100644
--- a/src/backend/Core.cpp
+++ b/src/backend/Core.cpp
@@ -1,5 +1,6 @@
 #include <Core.hpp>
 #include <Scheduler.hpp>
+#include <ParallelRDPWrapper.hpp>
 
 namespace n64 {
 u32 extraCycles = 0;
diff --git a/src/backend/core/Mem.cpp b/src/backend/core/Mem.cpp
index 4657075c..cef1125e 100644
--- a/src/backend/core/Mem.cpp
+++ b/src/backend/core/Mem.cpp
@@ -153,6 +153,8 @@ void Mem::LoadROM(bool isArchive, const std::string& filename) {
   memcpy(&rom.header, buf, sizeof(ROMHeader));
   memcpy(rom.gameNameCart, rom.header.imageName, sizeof(rom.header.imageName));
 
+  free(buf);
+
   rom.header.clockRate = be32toh(rom.header.clockRate);
   rom.header.programCounter = be32toh(rom.header.programCounter);
   rom.header.release = be32toh(rom.header.release);
diff --git a/src/frontend/KaizenQt.cpp b/src/frontend/KaizenQt.cpp
index bd394cb0..23485f27 100644
--- a/src/frontend/KaizenQt.cpp
+++ b/src/frontend/KaizenQt.cpp
@@ -25,4 +25,5 @@ void KaizenQt::ConnectMainWindowSignalsToSlots() noexcept
 void KaizenQt::LoadROM(const QString& file_name) noexcept
 {
   emuThread->core.LoadROM(file_name.toStdString());
+  emuThread->start();
 }