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

VulkanRenderer: Fix physical device bullshit 

Keep a single list instead of many
This commit is contained in:
Jérôme Leclercq 2020-10-30 23:06:56 +01:00
parent 009e5a0466
commit b62130dab9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@ namespace Nz
private: private:
std::list<Vk::Device> m_devices; std::list<Vk::Device> m_devices;
std::vector<Vk::PhysicalDevice> m_physDevices;
ParameterList m_initializationParameters; ParameterList m_initializationParameters;
Vk::Instance m_instance; Vk::Instance m_instance;
}; };

14
src/Nazara/VulkanRenderer/VulkanRenderer.cpp
View File

@ -32,8 +32,10 @@ namespace Nz
std::shared_ptr<RenderDevice> VulkanRenderer::InstanciateRenderDevice(std::size_t deviceIndex) std::shared_ptr<RenderDevice> VulkanRenderer::InstanciateRenderDevice(std::size_t deviceIndex)
{ {
assert(deviceIndex < m_physDevices.size()); const auto& physDevices = Vulkan::GetPhysicalDevices();
return Vulkan::SelectDevice(m_physDevices[deviceIndex]);
assert(deviceIndex < physDevices.size());
return Vulkan::SelectDevice(physDevices[deviceIndex]);
} }
bool VulkanRenderer::Prepare(const ParameterList& parameters) bool VulkanRenderer::Prepare(const ParameterList& parameters)
@ -61,10 +63,12 @@ namespace Nz
std::vector<RenderDeviceInfo> VulkanRenderer::QueryRenderDevices() const std::vector<RenderDeviceInfo> VulkanRenderer::QueryRenderDevices() const
{ {
std::vector<RenderDeviceInfo> devices; const auto& physDevices = Vulkan::GetPhysicalDevices();
devices.reserve(m_physDevices.size());
for (const Vk::PhysicalDevice& physDevice : m_physDevices) std::vector<RenderDeviceInfo> devices;
devices.reserve(physDevices.size());
for (const Vk::PhysicalDevice& physDevice : physDevices)
{ {
RenderDeviceInfo& device = devices.emplace_back(); RenderDeviceInfo& device = devices.emplace_back();
device.name = physDevice.properties.deviceName; device.name = physDevice.properties.deviceName;