Fix build for non-WIN32 platforms

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
parent 3b6e3fb3b4
commit 22d49ae96a
5 changed files with 12 additions and 5 deletions

View File

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

View File

@ -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<vk::physical_device>& 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());

View File

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

View File

@ -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

View File

@ -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)
{