From 9b8e8042e405fda8c493c79834dada1435dc636d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Fri, 9 Mar 2018 16:47:31 +0100 Subject: [PATCH] Merge fix --- include/Nazara/Renderer/RenderSurface.hpp | 2 +- include/Nazara/Renderer/RenderWindowImpl.hpp | 2 +- include/Nazara/Renderer/RenderWindowParameters.hpp | 2 +- include/Nazara/Renderer/RendererImpl.hpp | 2 +- include/Nazara/VulkanRenderer/Utils.hpp | 2 +- include/Nazara/VulkanRenderer/VkRenderTarget.hpp | 2 +- include/Nazara/VulkanRenderer/VkRenderWindow.hpp | 2 +- include/Nazara/VulkanRenderer/Vulkan.hpp | 2 +- include/Nazara/VulkanRenderer/VulkanBuffer.hpp | 2 +- include/Nazara/VulkanRenderer/VulkanDevice.hpp | 2 +- include/Nazara/VulkanRenderer/VulkanRenderer.hpp | 2 +- include/Nazara/VulkanRenderer/VulkanSurface.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Device.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Image.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Instance.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Loader.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Queue.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Surface.hpp | 2 +- include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp | 2 +- src/Nazara/VulkanRenderer/Export.cpp | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/include/Nazara/Renderer/RenderSurface.hpp b/include/Nazara/Renderer/RenderSurface.hpp index a452dcfbc..177730511 100644 --- a/include/Nazara/Renderer/RenderSurface.hpp +++ b/include/Nazara/Renderer/RenderSurface.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_RENDERSURFACE_HPP #define NAZARA_RENDERSURFACE_HPP -#include +#include #include #include diff --git a/include/Nazara/Renderer/RenderWindowImpl.hpp b/include/Nazara/Renderer/RenderWindowImpl.hpp index d9d7f51cd..eb1bb8282 100644 --- a/include/Nazara/Renderer/RenderWindowImpl.hpp +++ b/include/Nazara/Renderer/RenderWindowImpl.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_RENDERWINDOWIMPL_HPP #define NAZARA_RENDERWINDOWIMPL_HPP -#include +#include #include #include #include diff --git a/include/Nazara/Renderer/RenderWindowParameters.hpp b/include/Nazara/Renderer/RenderWindowParameters.hpp index 78645b54c..a850a944b 100644 --- a/include/Nazara/Renderer/RenderWindowParameters.hpp +++ b/include/Nazara/Renderer/RenderWindowParameters.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_RENDERWINDOWPARAMETERS_HPP #define NAZARA_RENDERWINDOWPARAMETERS_HPP -#include +#include #include #include diff --git a/include/Nazara/Renderer/RendererImpl.hpp b/include/Nazara/Renderer/RendererImpl.hpp index 38b043980..c57b41781 100644 --- a/include/Nazara/Renderer/RendererImpl.hpp +++ b/include/Nazara/Renderer/RendererImpl.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_RENDERER_RENDERERIMPL_HPP #define NAZARA_RENDERER_RENDERERIMPL_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Utils.hpp b/include/Nazara/VulkanRenderer/Utils.hpp index cd856a49c..5fa483b5c 100644 --- a/include/Nazara/VulkanRenderer/Utils.hpp +++ b/include/Nazara/VulkanRenderer/Utils.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_UTILS_VULKAN_HPP #define NAZARA_UTILS_VULKAN_HPP -#include +#include #include #include diff --git a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp index 52e7b034d..138651475 100644 --- a/include/Nazara/VulkanRenderer/VkRenderTarget.hpp +++ b/include/Nazara/VulkanRenderer/VkRenderTarget.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_RENDERTARGET_HPP #define NAZARA_VULKANRENDERER_RENDERTARGET_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/VkRenderWindow.hpp b/include/Nazara/VulkanRenderer/VkRenderWindow.hpp index 0ac221adc..186287703 100644 --- a/include/Nazara/VulkanRenderer/VkRenderWindow.hpp +++ b/include/Nazara/VulkanRenderer/VkRenderWindow.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_RENDERWINDOW_HPP #define NAZARA_VULKANRENDERER_RENDERWINDOW_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Vulkan.hpp b/include/Nazara/VulkanRenderer/Vulkan.hpp index 04f62637b..7701a95b0 100644 --- a/include/Nazara/VulkanRenderer/Vulkan.hpp +++ b/include/Nazara/VulkanRenderer/Vulkan.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKAN_HPP #define NAZARA_VULKAN_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/VulkanBuffer.hpp b/include/Nazara/VulkanRenderer/VulkanBuffer.hpp index 597cc7236..e44406152 100644 --- a/include/Nazara/VulkanRenderer/VulkanBuffer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanBuffer.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_BUFFER_HPP #define NAZARA_VULKANRENDERER_BUFFER_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/VulkanDevice.hpp b/include/Nazara/VulkanRenderer/VulkanDevice.hpp index 1e4344232..151caa80f 100644 --- a/include/Nazara/VulkanRenderer/VulkanDevice.hpp +++ b/include/Nazara/VulkanRenderer/VulkanDevice.hpp @@ -7,8 +7,8 @@ #ifndef NAZARA_VULKANRENDERER_VULKANDEVICE_HPP #define NAZARA_VULKANRENDERER_VULKANDEVICE_HPP -#include #include +#include #include #include diff --git a/include/Nazara/VulkanRenderer/VulkanRenderer.hpp b/include/Nazara/VulkanRenderer/VulkanRenderer.hpp index 74a2075a9..b7ae2b723 100644 --- a/include/Nazara/VulkanRenderer/VulkanRenderer.hpp +++ b/include/Nazara/VulkanRenderer/VulkanRenderer.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_HPP #define NAZARA_VULKANRENDERER_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/VulkanSurface.hpp b/include/Nazara/VulkanRenderer/VulkanSurface.hpp index e86d2fc2e..56505ce8e 100644 --- a/include/Nazara/VulkanRenderer/VulkanSurface.hpp +++ b/include/Nazara/VulkanRenderer/VulkanSurface.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_SURFACE_HPP #define NAZARA_VULKANRENDERER_SURFACE_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp index 2daf3d302..5783791c5 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Buffer.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKBUFFER_HPP #define NAZARA_VULKANRENDERER_VKBUFFER_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp index c1d2b9e54..5ef24bd7d 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/CommandBuffer.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP #define NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp index 1c1e2674a..7be788954 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/CommandPool.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP #define NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP -#include +#include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp index f9fad39d3..e087b58b2 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP #define NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP -#include +#include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp index 0c08a52f8..c9afa477e 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSet.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP #define NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp index fc95be3db..fc0c69c34 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DescriptorSetLayout.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP #define NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp index 227e8f512..4be5e53bf 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Device.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Device.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKDEVICE_HPP #define NAZARA_VULKANRENDERER_VKDEVICE_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp index 1613ea019..67b319083 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceMemory.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP #define NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp index 2c09fe638..e807d774a 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP #define NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP -#include +#include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp index 99f168be5..811bd2859 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Framebuffer.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP #define NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/Image.hpp b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp index eea75ee4d..67f59fb2d 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Image.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Image.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKIMAGE_HPP #define NAZARA_VULKANRENDERER_VKIMAGE_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp index 373cf18b6..3a0bb5cbb 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/ImageView.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP #define NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp index c8fafd9d3..71c3f08e5 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Instance.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKINSTANCE_HPP #define NAZARA_VULKANRENDERER_VKINSTANCE_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp index a1c4d4ed6..41620a0f4 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Loader.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKLOADER_HPP #define NAZARA_VULKANRENDERER_VKLOADER_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp index ead741a30..ea323ec49 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Pipeline.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKPIPELINE_HPP #define NAZARA_VULKANRENDERER_VKPIPELINE_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp index 405fee3c2..0fedec109 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineCache.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP #define NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp index fe5300127..f56f05639 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/PipelineLayout.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP #define NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/Queue.hpp b/include/Nazara/VulkanRenderer/Wrapper/Queue.hpp index f8502ab87..7b3e0436b 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Queue.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Queue.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKQUEUE_HPP #define NAZARA_VULKANRENDERER_VKQUEUE_HPP -#include +#include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp index 71c1d75e9..35e4b8268 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/RenderPass.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKRENDERPASS_HPP #define NAZARA_VULKANRENDERER_VKRENDERPASS_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp index baffe1171..8dfdf1cf9 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Semaphore.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP #define NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp index 65ee75ddc..db00805e5 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/ShaderModule.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP #define NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP -#include +#include #include namespace Nz diff --git a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp index 765848962..3c77ca00f 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Surface.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKSURFACE_HPP #define NAZARA_VULKANRENDERER_VKSURFACE_HPP -#include +#include #include #include #include diff --git a/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp index 5df920ba0..f3d2aac89 100644 --- a/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp +++ b/include/Nazara/VulkanRenderer/Wrapper/Swapchain.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP #define NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP -#include +#include #include #include diff --git a/src/Nazara/VulkanRenderer/Export.cpp b/src/Nazara/VulkanRenderer/Export.cpp index 42f89c79e..321038299 100644 --- a/src/Nazara/VulkanRenderer/Export.cpp +++ b/src/Nazara/VulkanRenderer/Export.cpp @@ -2,7 +2,7 @@ // This file is part of the "Nazara Engine - Vulkan Renderer" // For conditions of distribution and use, see copyright notice in Config.hpp -#include +#include #include extern "C"