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

Renderer: RenderWindow now requires a RenderDevice

Browse Source
This commit is contained in:
Lynix
2021-05-16 23:13:00 +02:00
parent 40772f2137
commit 13feaf4aab
30 changed files with 132 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,6 @@ namespace Nz
inline const VulkanRenderPass& GetRenderPass() const override;
inline const Vk::Swapchain& GetSwapchain() const;
inline std::shared_ptr<RenderDevice> GetRenderDevice() override;
void Present(UInt32 imageIndex, VkSemaphore waitSemaphore = VK_NULL_HANDLE);
VkRenderWindow& operator=(const VkRenderWindow&) = delete;

5
include/Nazara/VulkanRenderer/VkRenderWindow.inl
View File

@@ -36,11 +36,6 @@ namespace Nz
{
return m_swapchain;
}
inline std::shared_ptr<RenderDevice> VkRenderWindow::GetRenderDevice()
{
return m_device;
}
}
#include <Nazara/VulkanRenderer/DebugOff.hpp>

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

@@ -33,7 +33,7 @@ namespace Nz
RenderAPI QueryAPI() const override;
std::string QueryAPIString() const override;
UInt32 QueryAPIVersion() const override;
std::vector<RenderDeviceInfo> QueryRenderDevices() const override;
const std::vector<RenderDeviceInfo>& QueryRenderDevices() const override;
bool Prepare(const ParameterList& parameters) override;
@@ -41,6 +41,7 @@ namespace Nz
private:
std::list<Vk::Device> m_devices;
std::vector<RenderDeviceInfo> m_deviceInfos;
ParameterList m_initializationParameters;
Vk::Instance m_instance;
};