keep fixing parallel-rdp stuff

external/parallel-rdp/CMakeLists.txt

@@ -55,13 +55,18 @@ target_include_directories(parallel-rdp PUBLIC
   parallel-rdp-standalone/vulkan
   parallel-rdp-standalone/vulkan-headers/include
   parallel-rdp-standalone/util
-  ../../src/cores
+  ../../src/n64
+  ../../src/n64/core/
+  ../../src/n64/core/cpu/
+  ../../src/n64/core/cpu/registers
   parallel-rdp-standalone
   ..
   ../../src/frontend
+  ../../src
   ../imgui
   ../imgui/imgui
   ../imgui/imgui/backends
+  .
   )
 
 if(WIN32)

external/parallel-rdp/ParallelRDPWrapper.cpp

@@ -1,5 +1,5 @@
-#include <parallel-rdp/ParallelRDPWrapper.hpp>
-#include <n64/core/RDP.hpp>
+#include <ParallelRDPWrapper.hpp>
+#include <core/RDP.hpp>
 #include <memory>
 #include <rdp_device.hpp>
 #include <util.hpp>
@@ -115,7 +115,7 @@ WSI* LoadWSIPlatform(Vulkan::WSIPlatform* wsi_platform, std::unique_ptr<Parallel
   wsi->set_backbuffer_srgb(false);
   wsi->set_platform(wsi_platform);
   Context::SystemHandles handles;
-  if (!wsi->init_context_from_platform(1, handles)) {
+  if (!wsi->init_simple(1, handles)) {
     util::panic("Failed to initialize WSI!");
   }
 
@@ -139,11 +139,11 @@ void LoadParallelRDP(const u8* rdram) {
   fragLayout.sets[0].fp_mask = 1;
   fragLayout.sets[0].array_size[0] = 1;
 
-  u32* fullscreenQuadVert = nullptr, *fullscreenQuadFrag = nullptr;
-  util::ReadFileBinary("external/vert.spv", fullscreenQuadVert);
-  util::ReadFileBinary("external/frag.spv", fullscreenQuadFrag);
+  u32* fullscreenQuadVert, *fullscreenQuadFrag;
+  auto sizeVert = util::ReadFileBinary("external/vert.spv", fullscreenQuadVert);
+  auto sizeFrag = util::ReadFileBinary("external/frag.spv", fullscreenQuadFrag);
 
-  fullscreen_quad_program = wsi->get_device().request_program(fullscreenQuadVert, sizeof(fullscreenQuadVert), fullscreenQuadFrag, sizeof(fullscreenQuadFrag), &vertLayout, &fragLayout);
+  fullscreen_quad_program = wsi->get_device().request_program(fullscreenQuadVert, sizeVert, fullscreenQuadFrag, sizeFrag, &vertLayout, &fragLayout);
 
   auto aligned_rdram = reinterpret_cast<uintptr_t>(rdram);
   uintptr_t offset = 0;

external/parallel-rdp/ParallelRDPWrapper.hpp

@@ -2,7 +2,7 @@
 #include <Core.hpp>
 #include <wsi.hpp>
 #include <SDL2/SDL.h>
-#include <n64/core/mmio/VI.hpp>
+#include <core/mmio/VI.hpp>
 
 struct Window;
 static SDL_Window* window;