mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-11 18:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build for non-WIN32 platforms

Browse source 
Link explicitly against vkstatic.1.lib

fix linux path for vulkan glsl compiler

Restore wxWidgets version
This commit is contained in:
kd-11 2016-03-07 11:38:00 +03:00
commit 22d49ae96a
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "VKCommonDecompiler.h" #include "VKCommonDecompiler.h"
#include "../VulKan/glslang/SPIRV/GlslangToSpv.h" #include "../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h"
namespace vk namespace vk
{ {

8
rpcs3/Emu/RSX/VK/VKGSRender.cpp
View file

@ -160,15 +160,17 @@ VKGSRender::VKGSRender() : GSRender(frame_type::Vulkan)
{ {
shaders_cache.load(rsx::shader_language::glsl); shaders_cache.load(rsx::shader_language::glsl);
HINSTANCE hInstance = NULL;
HWND hWnd = (HWND)m_frame->handle();
m_thread_context.createInstance("RPCS3"); m_thread_context.createInstance("RPCS3");
m_thread_context.makeCurrentInstance(1); m_thread_context.makeCurrentInstance(1);
m_thread_context.enable_debugging(); m_thread_context.enable_debugging();
#ifdef _WIN32
HINSTANCE hInstance = NULL;
HWND hWnd = (HWND)m_frame->handle();
std::vector<vk::physical_device>& gpus = m_thread_context.enumerateDevices(); std::vector<vk::physical_device>& gpus = m_thread_context.enumerateDevices();
m_swap_chain = m_thread_context.createSwapChain(hInstance, hWnd, gpus[0]); m_swap_chain = m_thread_context.createSwapChain(hInstance, hWnd, gpus[0]);
#endif
m_device = (vk::render_device *)(&m_swap_chain->get_device()); m_device = (vk::render_device *)(&m_swap_chain->get_device());

2
rpcs3/Emu/RSX/VK/VKGSRender.h
View file

@ -9,6 +9,8 @@
#include "VKProgramBuffer.h" #include "VKProgramBuffer.h"
#include "../GCM.h" #include "../GCM.h"
#pragma comment(lib, "VKstatic.1.lib")
class VKGSRender : public GSRender class VKGSRender : public GSRender
{ {
private: private:

3
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -1044,6 +1044,7 @@ namespace vk
return gpus; return gpus;
} }
#ifdef _WIN32
vk::swap_chain* createSwapChain(HINSTANCE hInstance, HWND hWnd, vk::physical_device &dev) vk::swap_chain* createSwapChain(HINSTANCE hInstance, HWND hWnd, vk::physical_device &dev)
{ {
VkWin32SurfaceCreateInfoKHR createInfo; VkWin32SurfaceCreateInfoKHR createInfo;
@ -1133,6 +1134,8 @@ namespace vk
return new swap_chain(dev, presentQueueNodeIndex, graphicsQueueNodeIndex, format, surface, color_space); return new swap_chain(dev, presentQueueNodeIndex, graphicsQueueNodeIndex, format, surface, color_space);
} }
#endif //if _WIN32
}; };
class descriptor_pool class descriptor_pool

2
rpcs3/Gui/SettingsDialog.cpp
View file

@ -250,9 +250,9 @@ SettingsDialog::SettingsDialog(wxWindow *parent, rpcs3::config_t* cfg)
cbox_gs_d3d_adaptater->Enable(false); cbox_gs_d3d_adaptater->Enable(false);
chbox_gs_overlay->Enable(false); chbox_gs_overlay->Enable(false);
} }
#endif
cbox_gs_render->Append("Vulkan"); cbox_gs_render->Append("Vulkan");
#endif
for (int i = 1; i < WXSIZEOF(ResolutionTable); ++i) for (int i = 1; i < WXSIZEOF(ResolutionTable); ++i)
{ {