Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Graphics is now a global object, instead of a per-window one

Browse Source
This commit is contained in:
HOEGLER Stefan
2020-03-15 15:58:01 +01:00
parent 30e256d0aa
commit 3b55755f0c
20 changed files with 121 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Graphics/Vulkan/VulkanGraphics.cpp
+62 -37
View File
@@ -4,34 +4,27 @@
#include "VulkanInitializer.h"
#include <GLFW/glfw3.h>
Seele::VulkanGraphics::VulkanGraphics()
: callback(VK_NULL_HANDLE)
, handle(VK_NULL_HANDLE)
, instance(VK_NULL_HANDLE)
, physicalDevice(VK_NULL_HANDLE)
{
glfwInit();
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
}
Seele::VulkanGraphics::~VulkanGraphics()
{
glfwTerminate();
}
void Seele::VulkanGraphics::init(GraphicsInitializer initInfo)
{
VkApplicationInfo appInfo = {};
appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
appInfo.pApplicationName = initInfo.applicationName;
appInfo.applicationVersion = VK_MAKE_VERSION(0, 0, 1);
appInfo.pEngineName = initInfo.engineName;
appInfo.engineVersion = VK_MAKE_VERSION(0, 0, 1);
appInfo.apiVersion = VK_API_VERSION_1_1;
VkInstanceCreateInfo info = {};
info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
info.pApplicationInfo = &appInfo;
Array<const char*> extensions = getRequiredExtensions();
for (uint32 i = 0; i < initInfo.instanceExtensions.size(); ++i)
{
extensions.add(initInfo.instanceExtensions[i]);
}
info.enabledExtensionCount = (uint32)extensions.size();
info.ppEnabledExtensionNames = extensions.data();
#ifdef ENABLE_VALIDATION
info.enabledLayerCount = (uint32)initInfo.layers.size();
info.ppEnabledLayerNames = initInfo.layers.data();
#else
info.enabledLayerCount = 0;
#endif
VK_CHECK(vkCreateInstance(&info, nullptr, &instance));
initInstance(initInfo);
setupDebugCallback();
pickPhysicalDevice();
allocator = new VulkanAllocator(this);
}
@@ -52,17 +45,6 @@ void* Seele::VulkanGraphics::createWindow(const WindowCreateInfo& createInfo)
return window;
}
Seele::VulkanGraphics::VulkanGraphics()
{
glfwInit();
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
}
Seele::VulkanGraphics::~VulkanGraphics()
{
glfwTerminate();
}
VkDevice Seele::VulkanGraphics::getDevice() const
{
return handle;
@@ -88,6 +70,34 @@ Seele::Array<const char*> Seele::VulkanGraphics::getRequiredExtensions()
#endif // ENABLE_VALIDATION
return extensions;
}
void Seele::VulkanGraphics::initInstance(GraphicsInitializer initInfo)
{
VkApplicationInfo appInfo = {};
appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
appInfo.pApplicationName = initInfo.applicationName;
appInfo.applicationVersion = VK_MAKE_VERSION(0, 0, 1);
appInfo.pEngineName = initInfo.engineName;
appInfo.engineVersion = VK_MAKE_VERSION(0, 0, 1);
appInfo.apiVersion = VK_API_VERSION_1_1;
VkInstanceCreateInfo info = {};
info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
info.pApplicationInfo = &appInfo;
Array<const char*> extensions = getRequiredExtensions();
for (uint32 i = 0; i < initInfo.instanceExtensions.size(); ++i)
{
extensions.add(initInfo.instanceExtensions[i]);
}
info.enabledExtensionCount = (uint32)extensions.size();
info.ppEnabledExtensionNames = extensions.data();
#ifdef ENABLE_VALIDATION
info.enabledLayerCount = (uint32)initInfo.layers.size();
info.ppEnabledLayerNames = initInfo.layers.data();
#else
info.enabledLayerCount = 0;
#endif
VK_CHECK(vkCreateInstance(&info, nullptr, &instance));
}
void Seele::VulkanGraphics::setupDebugCallback()
{
VkDebugReportCallbackCreateInfoEXT createInfo =
@@ -95,4 +105,19 @@ void Seele::VulkanGraphics::setupDebugCallback()
VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT | VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT);
VK_CHECK(CreateDebugReportCallbackEXT(instance, &createInfo, nullptr, &callback));
}
}
void Seele::VulkanGraphics::pickPhysicalDevice()
{
uint32 physicalDeviceCount;
vkEnumeratePhysicalDevices(instance, &physicalDeviceCount, nullptr);
Array<VkPhysicalDevice> physicalDevices(physicalDeviceCount);
vkEnumeratePhysicalDevices(instance, &physicalDeviceCount, physicalDevices.data());
VkPhysicalDevice bestDevice;
uint32 deviceRating = 0;
for (auto physicalDevice : physicalDevices)
{
VkPhysicalDeviceProperties props;
vkGetPhysicalDeviceProperties(physicalDevice, &props);
}
}
src/Engine/Graphics/Vulkan/VulkanGraphics.h
+3
View File
@@ -19,12 +19,15 @@ namespace Seele
virtual void* createWindow(const WindowCreateInfo& createInfo) override;
protected:
Array<const char*> getRequiredExtensions();
void initInstance(GraphicsInitializer initInfo);
void setupDebugCallback();
void pickPhysicalDevice();
VkDevice handle;
VkPhysicalDevice physicalDevice;
VkInstance instance;
VkDebugReportCallbackEXT callback;
Array<PVulkanViewport> viewports;
PVulkanAllocator allocator;
friend class Window;
};
src/Engine/Graphics/Vulkan/VulkanGraphicsEnums.cpp
+4
View File
@@ -35,6 +35,7 @@ VkDescriptorType Seele::cast(const SeDescriptorType& descriptorType)
default:
break;
}
return VK_DESCRIPTOR_TYPE_MAX_ENUM;
}
SeDescriptorType Seele::cast(const VkDescriptorType& descriptorType)
@@ -71,6 +72,7 @@ SeDescriptorType Seele::cast(const VkDescriptorType& descriptorType)
default:
break;
}
return SE_DESCRIPTOR_TYPE_MAX_ENUM;
}
VkShaderStageFlagBits Seele::cast(const SeShaderStageFlagBits& stage)
@@ -113,6 +115,7 @@ VkShaderStageFlagBits Seele::cast(const SeShaderStageFlagBits& stage)
default:
break;
}
return VK_SHADER_STAGE_ALL;
}
SeShaderStageFlagBits Seele::cast(const VkShaderStageFlagBits& stage)
@@ -154,4 +157,5 @@ SeShaderStageFlagBits Seele::cast(const VkShaderStageFlagBits& stage)
default:
break;
}
return SE_SHADER_STAGE_ALL;
}
src/Engine/Graphics/Vulkan/VulkanGraphicsResources.h
+21 -1
View File
@@ -11,6 +11,7 @@ namespace Seele
public:
VulkanDescriptorLayout(PVulkanGraphics graphics)
: graphics(graphics)
, layoutHandle(VK_NULL_HANDLE)
{}
virtual ~VulkanDescriptorLayout();
virtual void create();
@@ -30,6 +31,8 @@ namespace Seele
public:
VulkanPipelineLayout(PVulkanGraphics graphics)
: graphics(graphics)
, layoutHash(0)
, layoutHandle(VK_NULL_HANDLE)
{}
virtual ~VulkanPipelineLayout();
virtual void create();
@@ -53,7 +56,11 @@ namespace Seele
class VulkanDescriptorSet : public DescriptorSet
{
public:
VulkanDescriptorSet(PVulkanGraphics graphics, PVulkanDescriptorAllocator owner) : graphics(graphics), owner(owner) {}
VulkanDescriptorSet(PVulkanGraphics graphics, PVulkanDescriptorAllocator owner)
: graphics(graphics)
, owner(owner)
, setHandle(VK_NULL_HANDLE)
{}
virtual ~VulkanDescriptorSet();
virtual void updateBuffer(uint32_t binding, PUniformBuffer uniformBuffer);
virtual void updateBuffer(uint32_t binding, PStructuredBuffer uniformBuffer);
@@ -132,4 +139,17 @@ namespace Seele
VkSampler sampler;
};
DEFINE_REF(VulkanSamplerState);
class VulkanViewport : public Viewport
{
public:
private:
uint32 sizeX;
uint32 sizeY;
uint32 offsetX;
uint32 offsetY;
VkSwapchainKHR swapchain;
void* windowHandle;
};
DECLARE_REF(VulkanViewport);
}