sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix VulkanRenderer compilation under Linux ( 🖕 X.h)

This commit is contained in:
Jérôme Leclercq 2020-09-04 15:13:18 +02:00
parent d98cddcfe0
commit 5f9025c23c
11 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/VulkanRenderer/VkRenderTarget.hpp
View File

@ -14,7 +14,7 @@
#include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp> #include <Nazara/VulkanRenderer/Wrapper/RenderPass.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp> #include <Nazara/VulkanRenderer/Wrapper/Semaphore.hpp>
#include <unordered_map> #include <unordered_map>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
namespace Nz namespace Nz
{ {

2
include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp
View File

@ -12,7 +12,7 @@
#include <Nazara/Math/Rect.hpp> #include <Nazara/Math/Rect.hpp>
#include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp> #include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp>
#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp> #include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
namespace Nz namespace Nz
{ {

2
include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Math/Rect.hpp> #include <Nazara/Math/Rect.hpp>
#include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp> #include <Nazara/VulkanRenderer/Wrapper/AutoFree.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp> #include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
namespace Nz namespace Nz
{ {

2
include/Nazara/VulkanRenderer/Wrapper/Device.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/VulkanRenderer/Config.hpp> #include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp> #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp> #include <Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <array> #include <array>
#include <memory> #include <memory>
#include <unordered_set> #include <unordered_set>

2
include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp> #include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp> #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <string> #include <string>
namespace Nz namespace Nz

31
include/Nazara/VulkanRenderer/Wrapper/Instance.hpp
View File

@ -10,10 +10,39 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Config.hpp> #include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp> #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>
// Don't include vulkan.h because it does includes X11 headers which has some defines like "None", breaking compilation
#ifdef VK_USE_PLATFORM_ANDROID_KHR
#include <vulkan/vulkan_android.h>
#endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
#include <wayland-client.h>
#include <vulkan/vulkan_wayland.h>
#endif
#ifdef VK_USE_PLATFORM_WIN32_KHR
#include <windows.h>
#include <vulkan/vulkan_win32.h>
#endif
#ifdef VK_USE_PLATFORM_XCB_KHR
#include <xcb/xcb.h>
#include <vulkan/vulkan_xcb.h>
#endif
#ifdef VK_USE_PLATFORM_XLIB_KHR
typedef struct _XDisplay Display;
typedef unsigned long XID;
typedef XID Window;
typedef unsigned long VisualID;
#include <vulkan/vulkan_xlib.h>
#endif
namespace Nz namespace Nz
{ {
namespace Vk namespace Vk

2
include/Nazara/VulkanRenderer/Wrapper/InstanceObject.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp> #include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp> #include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <string> #include <string>
namespace Nz namespace Nz

2
include/Nazara/VulkanRenderer/Wrapper/Loader.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/DynLib.hpp> #include <Nazara/Core/DynLib.hpp>
#include <Nazara/VulkanRenderer/Config.hpp> #include <Nazara/VulkanRenderer/Config.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <vector> #include <vector>
namespace Nz namespace Nz

2
include/Nazara/VulkanRenderer/Wrapper/PhysicalDevice.hpp
View File

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP #ifndef NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP
#define NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP #define NAZARA_VULKANRENDERER_VKPHYSICALDEVICE_HPP
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>

2
include/Nazara/VulkanRenderer/Wrapper/QueueHandle.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequisites.hpp> #include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/MovablePtr.hpp> #include <Nazara/Core/MovablePtr.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp> #include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <vulkan/vulkan.h> #include <vulkan/vulkan_core.h>
namespace Nz namespace Nz
{ {

1
include/Nazara/VulkanRenderer/Wrapper/Surface.hpp
View File

@ -11,7 +11,6 @@
#include <Nazara/VulkanRenderer/Config.hpp> #include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp> #include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Instance.hpp> #include <Nazara/VulkanRenderer/Wrapper/Instance.hpp>
#include <vulkan/vulkan.h>
namespace Nz namespace Nz
{ {