diff --git a/.gitignore b/.gitignore index 13c29924..2281c2fb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ roms/ *.bin *.sh -.cache/ \ No newline at end of file +.cache/ +.vscode/ +vgcore.* \ No newline at end of file diff --git a/external/parallel-rdp/ParallelRDPWrapper.cpp b/external/parallel-rdp/ParallelRDPWrapper.cpp index a7cbf949..762a8cea 100644 --- a/external/parallel-rdp/ParallelRDPWrapper.cpp +++ b/external/parallel-rdp/ParallelRDPWrapper.cpp @@ -9,7 +9,6 @@ using namespace Vulkan; using namespace RDP; -using std::unique_ptr; static CommandProcessor* command_processor; static WSI* wsi; @@ -110,7 +109,7 @@ public: Program* fullscreen_quad_program; -void LoadParallelRDP(const u8* rdram) { +void LoadWSIPlatform() { wsi = new WSI(); wsi->set_backbuffer_srgb(false); wsi->set_platform(new SDLWSIPlatform()); @@ -118,7 +117,9 @@ void LoadParallelRDP(const u8* rdram) { if (!wsi->init_context_from_platform(1, handles)) { util::panic("Failed to initialize WSI!"); } +} +void LoadParallelRDP(const u8* rdram) { ResourceLayout vertLayout; ResourceLayout fragLayout; diff --git a/external/parallel-rdp/ParallelRDPWrapper.hpp b/external/parallel-rdp/ParallelRDPWrapper.hpp index ff07c4e3..7dd16ab3 100644 --- a/external/parallel-rdp/ParallelRDPWrapper.hpp +++ b/external/parallel-rdp/ParallelRDPWrapper.hpp @@ -16,6 +16,7 @@ uint32_t GetVkGraphicsQueueFamily(); VkFormat GetVkFormat(); VkCommandBuffer GetVkCommandBuffer(); void SubmitRequestedVkCommandBuffer(); +void LoadWSIPlatform(); void LoadParallelRDP(const u8* rdram); void UpdateScreenParallelRdp(Window& imguiWindow, const n64::VI& vi); void ParallelRdpEnqueueCommand(int command_length, u32* buffer); diff --git a/src/frontend/imgui/Window.cpp b/src/frontend/imgui/Window.cpp index d02da945..f6dfac16 100644 --- a/src/frontend/imgui/Window.cpp +++ b/src/frontend/imgui/Window.cpp @@ -8,6 +8,7 @@ Window::Window(std::shared_ptr core) : core(std::move(core)) { InitSDL(); + LoadWSIPlatform(); InitImgui(); }