OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix linux compile errors from the zvulkan switch

Browse source
This commit is contained in:
Magnus Norddahl 2022-12-04 22:36:32 +01:00 • committed by Christoph Oelckers
commit 03ab65ab1e
7 changed files with 19 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libraries/ZVulkan/src/vulkanbuilders.cpp
View file

@ -1543,39 +1543,25 @@ std::shared_ptr<VulkanInstance> VulkanInstanceBuilder::Create()
/////////////////////////////////////////////////////////////////////////////
#ifdef VK_USE_PLATFORM_WIN32_KHR
VulkanSurfaceBuilder::VulkanSurfaceBuilder()
{
}
#ifdef VK_USE_PLATFORM_WIN32_KHR
VulkanSurfaceBuilder& VulkanSurfaceBuilder::Win32Window(HWND hwnd)
{
this->hwnd = hwnd;
return *this;
}
#elif defined(VK_USE_PLATFORM_XLIB_KHR)
VulkanSurfaceBuilder& VulkanSurfaceBuilder::X11Window(Display* disp, Window wind)
{
this->disp = disp;
this->wind = wind;
}
#endif
std::shared_ptr<VulkanSurface> VulkanSurfaceBuilder::Create(std::shared_ptr<VulkanInstance> instance)
{
#ifdef VK_USE_PLATFORM_WIN32_KHR
return std::make_shared<VulkanSurface>(std::move(instance), hwnd);
#elif defined(VK_USE_PLATFORM_XLIB_KHR)
return std::make_shared<VulkanSurface>(std::move(instance), disp, wind);
#else
return std::make_shared<VulkanSurface>(std::move(instance));
#endif
}
#endif
/////////////////////////////////////////////////////////////////////////////
VulkanDeviceBuilder::VulkanDeviceBuilder()