From f10c6b4ff6b2c1a4be8c1db1cd5578cff9b6cfaa Mon Sep 17 00:00:00 2001 From: mafiesto4 Date: Tue, 5 Jan 2021 19:51:47 +0100 Subject: [PATCH] Fix Linux build --- .../Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.cpp | 2 +- Source/Engine/Platform/Linux/IncludeX11.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.cpp b/Source/Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.cpp index 0f62b36b6..dc864ec47 100644 --- a/Source/Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.cpp +++ b/Source/Engine/GraphicsDevice/Vulkan/Linux/LinuxVulkanPlatform.cpp @@ -47,7 +47,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXlibPresentationSupportKHR( extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR; extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR; -void LinuxVulkanPlatform::GetInstanceExtensions(Array& outExextensionstensions) +void LinuxVulkanPlatform::GetInstanceExtensions(Array& extensions) { // Include X11 surface extension extensions.Add(VK_KHR_SURFACE_EXTENSION_NAME); diff --git a/Source/Engine/Platform/Linux/IncludeX11.h b/Source/Engine/Platform/Linux/IncludeX11.h index a50c91762..c286d4060 100644 --- a/Source/Engine/Platform/Linux/IncludeX11.h +++ b/Source/Engine/Platform/Linux/IncludeX11.h @@ -2,6 +2,9 @@ #pragma once +// Hide warning from old headers +#define register + namespace X11 { #include