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

Vulkan/RenderWindow: Move RenderPass to RenderTarget 

Former-commit-id: a02917920c9cda7ab7cfcca924b1234041ac61b3 [formerly a85ebe44046d945f2b429eae5dee8344fa08e520]
Former-commit-id: eebab1d2b76ed504392b66a199b99522095eca3e
This commit is contained in:
Lynix 2016-07-07 14:09:51 +02:00
parent 033c058185
commit 907676f7c6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Vulkan/RenderTarget.hpp
View File

@ -11,6 +11,7 @@
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Vulkan/Config.hpp> #include <Nazara/Vulkan/Config.hpp>
#include <Nazara/Vulkan/VkFrameBuffer.hpp> #include <Nazara/Vulkan/VkFrameBuffer.hpp>
#include <Nazara/Vulkan/VkRenderPass.hpp>
#include <unordered_map> #include <unordered_map>
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
@ -30,6 +31,8 @@ namespace Nz
virtual bool Acquire(const Vk::Framebuffer** framebuffer) const = 0; virtual bool Acquire(const Vk::Framebuffer** framebuffer) const = 0;
const Vk::RenderPass& GetRenderPass() const { return m_renderPass; }
virtual void Present() = 0; virtual void Present() = 0;
RenderTarget& operator=(const RenderTarget&) = delete; RenderTarget& operator=(const RenderTarget&) = delete;
@ -38,6 +41,9 @@ namespace Nz
// Signals: // Signals:
NazaraSignal(OnRenderTargetRelease, const RenderTarget* /*renderTarget*/); NazaraSignal(OnRenderTargetRelease, const RenderTarget* /*renderTarget*/);
NazaraSignal(OnRenderTargetSizeChange, const RenderTarget* /*renderTarget*/); NazaraSignal(OnRenderTargetSizeChange, const RenderTarget* /*renderTarget*/);
protected:
Vk::RenderPass m_renderPass;
}; };
} }

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

@ -17,7 +17,6 @@
#include <Nazara/Vulkan/VkCommandPool.hpp> #include <Nazara/Vulkan/VkCommandPool.hpp>
#include <Nazara/Vulkan/VkDevice.hpp> #include <Nazara/Vulkan/VkDevice.hpp>
#include <Nazara/Vulkan/VkFramebuffer.hpp> #include <Nazara/Vulkan/VkFramebuffer.hpp>
#include <Nazara/Vulkan/VkRenderPass.hpp>
#include <Nazara/Vulkan/VkSemaphore.hpp> #include <Nazara/Vulkan/VkSemaphore.hpp>
#include <Nazara/Vulkan/VkSurface.hpp> #include <Nazara/Vulkan/VkSurface.hpp>
#include <Nazara/Vulkan/VkSwapchain.hpp> #include <Nazara/Vulkan/VkSwapchain.hpp>
@ -75,7 +74,6 @@ namespace Nz
Vk::CommandPool m_cmdPool; Vk::CommandPool m_cmdPool;
Vk::DeviceHandle m_device; Vk::DeviceHandle m_device;
Vk::Queue m_presentQueue; Vk::Queue m_presentQueue;
Vk::RenderPass m_renderPass;
Vk::Semaphore m_imageReadySemaphore; Vk::Semaphore m_imageReadySemaphore;
Vk::Surface m_surface; Vk::Surface m_surface;
Vk::Swapchain m_swapchain; Vk::Swapchain m_swapchain;