GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update DeviceManager

Browse Source
This commit is contained in:
GeorgH93
2021-07-21 01:59:11 +02:00
parent cfbf31cb77
commit 58f2efb360
6 changed files with 100 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openVulkanoCpp/Vulkan/Context.cpp
View File

@@ -29,8 +29,8 @@ namespace openVulkanoCpp::Vulkan
CreateDevice();
swapChain.Init(device, surface, window);
swapChainRenderPass.Init(device, &swapChain);
swapChain.Init(device.get(), surface, window);
swapChainRenderPass.Init(device.get(), &swapChain);
pipeline.Init(device->device);
@@ -75,10 +75,11 @@ namespace openVulkanoCpp::Vulkan
void Context::CreateDevice()
{
const std::vector<std::string> neededExtensions = { VK_KHR_SWAPCHAIN_EXTENSION_NAME };
deviceManager.Init(instance);
device = deviceManager.GetCompatibleDevice({ VK_KHR_SWAPCHAIN_EXTENSION_NAME });
device->PrepareDevice({ VK_KHR_SWAPCHAIN_EXTENSION_NAME }, surface);
device = deviceManager.GetCompatibleDevice(neededExtensions);
device->PrepareDevice(neededExtensions, surface);
dynamicDispatch.init(instance, &vkGetInstanceProcAddr, device->device, &vkGetDeviceProcAddr);
Logger::RENDER->info("Found device: {0}", device->GetDeviceName());;
Logger::RENDER->info("Found device: {0}", device->GetDeviceName());
}
}

2
openVulkanoCpp/Vulkan/Context.hpp
View File

@@ -30,7 +30,7 @@ namespace openVulkanoCpp
vk::Instance instance; // Vulkan instance
vk::DispatchLoaderDynamic dynamicDispatch; // for access to features not available in statically linked Vulkan lib
vk::SurfaceKHR surface; // Vulkan surface to display framebuffer on
Device* device = nullptr;
std::shared_ptr<Device> device;
SwapChain swapChain;
RenderPass swapChainRenderPass;
IVulkanWindow* window = nullptr;

2
openVulkanoCpp/Vulkan/Device.cpp
View File

@@ -126,7 +126,7 @@ namespace openVulkanoCpp::Vulkan
queueFamilyProperties = physicalDevice.getQueueFamilyProperties();
properties = physicalDevice.getProperties();
features = physicalDevice.getFeatures();
for (auto& ext : physicalDevice.enumerateDeviceExtensionProperties()) { supportedExtensions.insert(ext.extensionName); }
for (auto& ext : physicalDevice.enumerateDeviceExtensionProperties()) { supportedExtensions.insert(ext.extensionName.data()); }
// Query device memory properties
memoryProperties = physicalDevice.getMemoryProperties();

4
openVulkanoCpp/Vulkan/Device.hpp
View File

@@ -47,7 +47,7 @@ namespace openVulkanoCpp
[[nodiscard]] std::string GetDeviceName() const
{
return properties.deviceName;
return properties.deviceName.data();
}
void PrepareDevice(const vk::ArrayProxy<const std::string>& requestedExtensions, const vk::SurfaceKHR& surface);
@@ -75,7 +75,7 @@ namespace openVulkanoCpp
void ExecuteNow(const std::function<void(const vk::CommandBuffer& commandBuffer)>& function) const;
vk::ShaderModule CreateShaderModule(const std::string& filename) const;
[[nodiscard]] vk::ShaderModule CreateShaderModule(const std::string& filename) const;
vk::ShaderModule CreateShaderModule(vk::ShaderModuleCreateInfo& createInfo) const;

58
openVulkanoCpp/Vulkan/DeviceManager.cpp Normal file
View File

@@ -0,0 +1,58 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include "DeviceManager.hpp"
#include "Device.hpp"
#include <stdexcept>
namespace openVulkanoCpp::Vulkan
{
void DeviceManager::Init(const vk::Instance& instance)
{
if (!devices.empty()) Close();
for (auto& physicalDevice: instance.enumeratePhysicalDevices())
{
devices.push_back(std::make_shared<Device>(physicalDevice));
}
}
std::shared_ptr<Device> DeviceManager::GetCompatibleDevice(const vk::ArrayProxy<const std::string>& deviceExtensions)
{
for (const auto& device: devices)
{
if (device->IsExtensionAvailable(deviceExtensions)) return device;
}
throw std::runtime_error("No device with required extensions found!\n" + ProduceMissingDeviceCompatibilityReport(deviceExtensions));
}
std::string DeviceManager::ProduceMissingDeviceCompatibilityReport(const vk::ArrayProxy<const std::string>& deviceExtensions)
{
std::stringstream ss;
ss << "Requested Extensions: [";
bool first = true;
for (const std::string& ext : deviceExtensions)
{
ss << ' ' << ext;
if (first) first = false;
else ss << ',';
}
ss << " ]\nAvailable Devices: [\n";
for (const auto& device: devices)
{
ss << '\t' << device->GetDeviceName() << ": [";
first = true;
for (const std::string& ext : device->GetExtensions())
{
ss << ' ' << ext;
if (first) first = false;
else ss << ',';
}
ss << " ]\n";
}
ss << ']';
return ss.str();
}
}

54
openVulkanoCpp/Vulkan/DeviceManager.hpp
View File

@@ -1,44 +1,42 @@
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#pragma once
#include <stdexcept>
#include <memory>
#include <vector>
#include "Base/ICloseable.hpp"
#include "Device.hpp"
#include <vulkan/vulkan.hpp>
namespace openVulkanoCpp
namespace openVulkanoCpp::Vulkan
{
namespace Vulkan
{
class Device;
class DeviceManager : virtual public ICloseable
class DeviceManager final
{
std::vector<Device> devices;
std::vector<std::shared_ptr<Device>> devices;
public:
void Init(const vk::Instance& instance)
DeviceManager() = default;
DeviceManager(const vk::Instance& instance)
{
devices = std::vector<Device>();
for (auto& physicalDevice : instance.enumeratePhysicalDevices())
{
devices.emplace_back(physicalDevice);
}
Init(instance);
}
Device* GetCompatibleDevice(const std::vector<std::string>& deviceExtensions)
{
for (auto& device : devices)
{
if (device.IsExtensionAvailable(deviceExtensions)) return &device;
}
throw std::runtime_error("No device with required extensions found!");
}
~DeviceManager() = default;
void Close() override
void Init(const vk::Instance& instance);
std::shared_ptr<Device> GetCompatibleDevice(const vk::ArrayProxy<const std::string>& deviceExtensions);
std::string ProduceMissingDeviceCompatibilityReport(const vk::ArrayProxy<const std::string>& deviceExtensions);
void Close()
{
for (auto& device : devices)
{
device.Close();
}
devices.clear();
}
};
}
}