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

Merge fix

This commit is contained in:
Jérôme Leclercq 2018-03-09 16:47:31 +01:00
parent 7d54ac4c10
commit 9b8e8042e4
36 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/RenderSurface.hpp
View File

@ -7,7 +7,7 @@
#ifndef NAZARA_RENDERSURFACE_HPP
#define NAZARA_RENDERSURFACE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Platform/WindowHandle.hpp>
#include <Nazara/Renderer/Config.hpp>

2
include/Nazara/Renderer/RenderWindowImpl.hpp
View File

@ -7,7 +7,7 @@
#ifndef NAZARA_RENDERWINDOWIMPL_HPP
#define NAZARA_RENDERWINDOWIMPL_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Math/Vector2.hpp>
#include <Nazara/Platform/WindowHandle.hpp>
#include <Nazara/Renderer/Config.hpp>

2
include/Nazara/Renderer/RenderWindowParameters.hpp
View File

@ -7,7 +7,7 @@
#ifndef NAZARA_RENDERWINDOWPARAMETERS_HPP
#define NAZARA_RENDERWINDOWPARAMETERS_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Utility/PixelFormat.hpp>
#include <vector>

2
include/Nazara/Renderer/RendererImpl.hpp
View File

@ -7,7 +7,7 @@
#ifndef NAZARA_RENDERER_RENDERERIMPL_HPP
#define NAZARA_RENDERER_RENDERERIMPL_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/ParameterList.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Renderer/Config.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_UTILS_VULKAN_HPP
#define NAZARA_UTILS_VULKAN_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_RENDERTARGET_HPP
#define NAZARA_VULKANRENDERER_RENDERTARGET_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Signal.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/FrameBuffer.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_RENDERWINDOW_HPP
#define NAZARA_VULKANRENDERER_RENDERWINDOW_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Clock.hpp>
#include <Nazara/Math/Rect.hpp>
#include <Nazara/Math/Vector3.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKAN_HPP
#define NAZARA_VULKAN_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/Initializer.hpp>
#include <Nazara/Core/ParameterList.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_BUFFER_HPP
#define NAZARA_VULKANRENDERER_BUFFER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Utility/AbstractBuffer.hpp>
#include <Nazara/Utility/SoftwareBuffer.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>

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

@ -7,8 +7,8 @@
#ifndef NAZARA_VULKANRENDERER_VULKANDEVICE_HPP
#define NAZARA_VULKANRENDERER_VULKANDEVICE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Renderer/RenderDeviceInstance.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <vector>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_HPP
#define NAZARA_VULKANRENDERER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/RendererImpl.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_SURFACE_HPP
#define NAZARA_VULKANRENDERER_SURFACE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Renderer/RenderSurface.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Surface.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Swapchain.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKBUFFER_HPP
#define NAZARA_VULKANRENDERER_VKBUFFER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP
#define NAZARA_VULKANRENDERER_VKCOMMANDBUFFER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Math/Rect.hpp>
#include <Nazara/VulkanRenderer/Wrapper/CommandPool.hpp>
#include <vulkan/vulkan.h>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP
#define NAZARA_VULKANRENDERER_VKCOMMANDPOOL_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/HandledObject.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP
#define NAZARA_VULKANRENDERER_VKDESCRIPTORPOOL_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/HandledObject.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP
#define NAZARA_VULKANRENDERER_VKDESCRIPTORSET_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Math/Rect.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DescriptorPool.hpp>
#include <vulkan/vulkan.h>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP
#define NAZARA_VULKANRENDERER_VKDESCRIPTORSETLAYOUT_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKDEVICE_HPP
#define NAZARA_VULKANRENDERER_VKDEVICE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/HandledObject.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP
#define NAZARA_VULKANRENDERER_VKDEVICEMEMORY_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP
#define NAZARA_VULKANRENDERER_VKDEVICEOBJECT_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <vulkan/vulkan.h>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP
#define NAZARA_VULKANRENDERER_VKFRAMEBUFFER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKIMAGE_HPP
#define NAZARA_VULKANRENDERER_VKIMAGE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP
#define NAZARA_VULKANRENDERER_VKIMAGEVIEW_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKINSTANCE_HPP
#define NAZARA_VULKANRENDERER_VKINSTANCE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKLOADER_HPP
#define NAZARA_VULKANRENDERER_VKLOADER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/DynLib.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <vulkan/vulkan.h>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKPIPELINE_HPP
#define NAZARA_VULKANRENDERER_VKPIPELINE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP
#define NAZARA_VULKANRENDERER_VKPIPELINECACHE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP
#define NAZARA_VULKANRENDERER_VKPIPELINELAYOUT_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKQUEUE_HPP
#define NAZARA_VULKANRENDERER_VKQUEUE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Device.hpp>
#include <vulkan/vulkan.h>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKRENDERPASS_HPP
#define NAZARA_VULKANRENDERER_VKRENDERPASS_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP
#define NAZARA_VULKANRENDERER_VKSEMAPHORE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP
#define NAZARA_VULKANRENDERER_VKSHADERMODULE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
namespace Nz

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKSURFACE_HPP
#define NAZARA_VULKANRENDERER_VKSURFACE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Config.hpp>
#include <Nazara/VulkanRenderer/Wrapper/Loader.hpp>
#include <vulkan/vulkan.h>

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

@ -7,7 +7,7 @@
#ifndef NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP
#define NAZARA_VULKANRENDERER_VKSWAPCHAIN_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/Wrapper/DeviceObject.hpp>
#include <Nazara/VulkanRenderer/Wrapper/ImageView.hpp>

2
src/Nazara/VulkanRenderer/Export.cpp
View File

@ -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 <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/VulkanRenderer/VulkanRenderer.hpp>
extern "C"