diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp index 2d00f5d697..b3f943714c 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "VKCommonDecompiler.h" -#include "../VulKan/glslang/SPIRV/GlslangToSpv.h" +#include "../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h" namespace vk { diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index ae9fbacb6d..29839bd111 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -160,15 +160,17 @@ VKGSRender::VKGSRender() : GSRender(frame_type::Vulkan) { shaders_cache.load(rsx::shader_language::glsl); - HINSTANCE hInstance = NULL; - HWND hWnd = (HWND)m_frame->handle(); - m_thread_context.createInstance("RPCS3"); m_thread_context.makeCurrentInstance(1); m_thread_context.enable_debugging(); +#ifdef _WIN32 + HINSTANCE hInstance = NULL; + HWND hWnd = (HWND)m_frame->handle(); + std::vector& gpus = m_thread_context.enumerateDevices(); m_swap_chain = m_thread_context.createSwapChain(hInstance, hWnd, gpus[0]); +#endif m_device = (vk::render_device *)(&m_swap_chain->get_device()); diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index d4d930fc6c..808283fb7e 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -9,6 +9,8 @@ #include "VKProgramBuffer.h" #include "../GCM.h" +#pragma comment(lib, "VKstatic.1.lib") + class VKGSRender : public GSRender { private: diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 6bb3cf692a..9c4a9a4491 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1044,6 +1044,7 @@ namespace vk return gpus; } +#ifdef _WIN32 vk::swap_chain* createSwapChain(HINSTANCE hInstance, HWND hWnd, vk::physical_device &dev) { VkWin32SurfaceCreateInfoKHR createInfo; @@ -1133,6 +1134,8 @@ namespace vk return new swap_chain(dev, presentQueueNodeIndex, graphicsQueueNodeIndex, format, surface, color_space); } +#endif //if _WIN32 + }; class descriptor_pool diff --git a/rpcs3/Gui/SettingsDialog.cpp b/rpcs3/Gui/SettingsDialog.cpp index a5a6e61d12..b191917fb6 100644 --- a/rpcs3/Gui/SettingsDialog.cpp +++ b/rpcs3/Gui/SettingsDialog.cpp @@ -250,9 +250,9 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg) cbox_gs_d3d_adaptater->Enable(false); chbox_gs_overlay->Enable(false); } -#endif cbox_gs_render->Append("Vulkan"); +#endif for (int i = 1; i < WXSIZEOF(ResolutionTable); ++i) {