mirror of
https://github.com/bailwillharr/engine.git
synced 2024-09-21 04:51:18 +00:00
Fix seg fault
This commit is contained in:
parent
40c0c024a1
commit
ed5eb51535
@ -4,10 +4,9 @@
|
||||
|
||||
#include "engine.hpp"
|
||||
|
||||
#include <SDL_video.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
struct SDL_Window;
|
||||
|
||||
namespace engine::gfx {
|
||||
|
||||
|
||||
@ -19,7 +19,6 @@ namespace engine::gfx {
|
||||
|
||||
static std::vector<const char*> getRequiredVulkanExtensions(SDL_Window* window)
|
||||
{
|
||||
#ifdef ENGINE_BUILD_VULKAN
|
||||
SDL_bool res;
|
||||
|
||||
unsigned int sdlExtensionCount = 0;
|
||||
@ -30,12 +29,208 @@ namespace engine::gfx {
|
||||
assert(res == SDL_TRUE);
|
||||
|
||||
return requiredExtensions;
|
||||
#else
|
||||
return std::vector<const char*>{};
|
||||
#endif
|
||||
}
|
||||
|
||||
static VkBool32 debugMessenger(
|
||||
class Device::Impl {
|
||||
|
||||
public:
|
||||
Impl(AppInfo appInfo, SDL_Window* window)
|
||||
{
|
||||
#ifdef NDEBUG
|
||||
findAvailableLayers(m_layerInfo, false);
|
||||
#else
|
||||
findAvailableLayers(m_layerInfo, true);
|
||||
#endif
|
||||
m_instance = std::make_shared<Instance>(appInfo, m_layerInfo, getRequiredVulkanExtensions(window));
|
||||
m_debugMessenger = std::make_unique<DebugMessenger>(m_instance);
|
||||
}
|
||||
~Impl()
|
||||
{
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
// VkSurfaceKHR m_surface;
|
||||
|
||||
struct LayerInfo {
|
||||
|
||||
static constexpr const char* VALIDATION_LAYER_NAME = "VK_LAYER_KHRONOS_validation";
|
||||
|
||||
std::vector<VkLayerProperties> layersAvailable{};
|
||||
std::optional<std::vector<VkLayerProperties>::iterator> validationLayer;
|
||||
|
||||
} m_layerInfo;
|
||||
|
||||
static void findAvailableLayers(LayerInfo& layerInfo, bool useValidation)
|
||||
{
|
||||
VkResult res;
|
||||
|
||||
uint32_t layerCount;
|
||||
res = vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
|
||||
assert(res == VK_SUCCESS);
|
||||
layerInfo.layersAvailable.resize(layerCount);
|
||||
res = vkEnumerateInstanceLayerProperties(&layerCount, layerInfo.layersAvailable.data());
|
||||
assert(res == VK_SUCCESS);
|
||||
|
||||
if (useValidation == true) {
|
||||
// find validation layer and print all layers to log
|
||||
for (auto it = layerInfo.layersAvailable.begin(); it != layerInfo.layersAvailable.end(); it++) {
|
||||
if (strncmp(it->layerName, LayerInfo::VALIDATION_LAYER_NAME, 256) == 0) {
|
||||
layerInfo.validationLayer = it;
|
||||
}
|
||||
}
|
||||
if (layerInfo.validationLayer.has_value() == false) {
|
||||
CRITICAL("The validation layer was not found. Quitting.");
|
||||
throw std::runtime_error("Validation layer not found");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class Instance {
|
||||
|
||||
public:
|
||||
Instance(AppInfo appInfo, const LayerInfo& layerInfo, const std::vector<const char*>& windowExtensions)
|
||||
{
|
||||
VkResult res;
|
||||
|
||||
int appVersionMajor, appVersionMinor, appVersionPatch;
|
||||
assert(versionFromCharArray(appInfo.version, &appVersionMajor, &appVersionMinor, &appVersionPatch));
|
||||
int engineVersionMajor, engineVersionMinor, engineVersionPatch;
|
||||
assert(versionFromCharArray(ENGINE_VERSION, &engineVersionMajor, &engineVersionMinor, &engineVersionPatch));
|
||||
|
||||
VkApplicationInfo applicationInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
|
||||
.pNext = nullptr,
|
||||
.pApplicationName = appInfo.name,
|
||||
.applicationVersion = VK_MAKE_VERSION(appVersionMajor, appVersionMinor, appVersionPatch),
|
||||
.pEngineName = "engine",
|
||||
.engineVersion = VK_MAKE_VERSION(engineVersionMajor, engineVersionMinor, engineVersionPatch),
|
||||
.apiVersion = VK_API_VERSION_1_0,
|
||||
};
|
||||
|
||||
// make a list of all extensions to use
|
||||
std::vector<const char*> extensions{};
|
||||
extensions.insert(extensions.end(), windowExtensions.begin(), windowExtensions.end());
|
||||
|
||||
std::vector<const char*> layers{};
|
||||
|
||||
if (layerInfo.validationLayer.has_value()) {
|
||||
layers.push_back(layerInfo.validationLayer.value()->layerName);
|
||||
extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
|
||||
}
|
||||
|
||||
VkInstanceCreateInfo instanceInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.pApplicationInfo = &applicationInfo,
|
||||
.enabledLayerCount = (uint32_t)layers.size(),
|
||||
.ppEnabledLayerNames = layers.data(),
|
||||
.enabledExtensionCount = (uint32_t)extensions.size(),
|
||||
.ppEnabledExtensionNames = extensions.data(),
|
||||
};
|
||||
|
||||
VkDebugUtilsMessengerCreateInfoEXT debugMessengerCreateInfo = DebugMessenger::getCreateInfo();
|
||||
|
||||
if (layerInfo.validationLayer.has_value()) {
|
||||
instanceInfo.pNext = &debugMessengerCreateInfo;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
for (const char* ext : extensions) {
|
||||
TRACE("Using Vulkan instance extension: {}", ext);
|
||||
}
|
||||
#endif
|
||||
|
||||
res = vkCreateInstance(&instanceInfo, nullptr, &m_handle);
|
||||
if (res == VK_ERROR_INCOMPATIBLE_DRIVER) {
|
||||
CRITICAL("The graphics driver is incompatible with vulkan");
|
||||
throw std::runtime_error("Graphics driver is incompatible with Vulkan");
|
||||
}
|
||||
assert(res == VK_SUCCESS);
|
||||
|
||||
volkLoadInstance(m_handle);
|
||||
|
||||
}
|
||||
|
||||
~Instance()
|
||||
{
|
||||
INFO("DESTROYING INSTANCE...");
|
||||
vkDestroyInstance(m_handle, nullptr);
|
||||
INFO("DESTROYED INSTANCE.");
|
||||
}
|
||||
|
||||
VkInstance getHandle()
|
||||
{
|
||||
return m_handle;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
VkInstance m_handle;
|
||||
|
||||
};
|
||||
|
||||
class DebugMessenger {
|
||||
|
||||
public:
|
||||
DebugMessenger(std::shared_ptr<Instance> instance) : m_instance(instance)
|
||||
{
|
||||
VkDebugUtilsMessengerCreateInfoEXT createInfo = getCreateInfo();
|
||||
|
||||
VkResult res = vkCreateDebugUtilsMessengerEXT(instance->getHandle(), &createInfo, nullptr, &m_messengerHandle);
|
||||
assert(res == VK_SUCCESS);
|
||||
}
|
||||
|
||||
~DebugMessenger()
|
||||
{
|
||||
INFO("DESTROYING MESSENGER...");
|
||||
vkDestroyDebugUtilsMessengerEXT(m_instance->getHandle(), m_messengerHandle, nullptr);
|
||||
INFO("DESTROYED MESSENGER.");
|
||||
}
|
||||
|
||||
static constexpr VkDebugUtilsMessageSeverityFlagBitsEXT MESSAGE_LEVEL = VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT;
|
||||
|
||||
static VkDebugUtilsMessengerCreateInfoEXT getCreateInfo()
|
||||
{
|
||||
VkDebugUtilsMessengerCreateInfoEXT createInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.messageSeverity = 0,
|
||||
.messageType =
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
|
||||
.pfnUserCallback = messengerCallback,
|
||||
.pUserData = nullptr,
|
||||
};
|
||||
|
||||
switch (MESSAGE_LEVEL) {
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT;
|
||||
// fall-through
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT;
|
||||
// fall-through
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT;
|
||||
// fall-through
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
|
||||
// fall-through
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return createInfo;
|
||||
}
|
||||
|
||||
private:
|
||||
VkDebugUtilsMessengerEXT m_messengerHandle;
|
||||
std::shared_ptr<Instance> m_instance;
|
||||
|
||||
static VkBool32 messengerCallback(
|
||||
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
|
||||
VkDebugUtilsMessageTypeFlagsEXT messageTypes,
|
||||
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
|
||||
@ -70,201 +265,10 @@ namespace engine::gfx {
|
||||
return VK_FALSE;
|
||||
}
|
||||
|
||||
class Device::Impl {
|
||||
friend Device;
|
||||
|
||||
public:
|
||||
Impl(AppInfo appInfo, SDL_Window* window)
|
||||
{
|
||||
m_instance = std::make_unique<Instance>(appInfo, getRequiredVulkanExtensions(window));
|
||||
#ifndef NDEBUG
|
||||
m_debugMessenger = std::make_unique<DebugMessenger>(m_instance->getHandle());
|
||||
#endif
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
// VkSurfaceKHR m_surface;
|
||||
|
||||
static constexpr VkDebugUtilsMessageSeverityFlagBitsEXT MESSAGE_LEVEL = VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT;
|
||||
|
||||
class Instance {
|
||||
|
||||
public:
|
||||
Instance(AppInfo appInfo, const std::vector<const char*>& windowExtensions)
|
||||
{
|
||||
VkResult res;
|
||||
|
||||
findAvailableLayers();
|
||||
|
||||
int appVersionMajor, appVersionMinor, appVersionPatch;
|
||||
assert(versionFromCharArray(appInfo.version, &appVersionMajor, &appVersionMinor, &appVersionPatch));
|
||||
int engineVersionMajor, engineVersionMinor, engineVersionPatch;
|
||||
assert(versionFromCharArray(ENGINE_VERSION, &engineVersionMajor, &engineVersionMinor, &engineVersionPatch));
|
||||
|
||||
VkApplicationInfo applicationInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
|
||||
.pNext = nullptr,
|
||||
.pApplicationName = appInfo.name,
|
||||
.applicationVersion = VK_MAKE_VERSION(appVersionMajor, appVersionMinor, appVersionPatch),
|
||||
.pEngineName = "engine",
|
||||
.engineVersion = VK_MAKE_VERSION(engineVersionMajor, engineVersionMinor, engineVersionPatch),
|
||||
.apiVersion = VK_API_VERSION_1_0,
|
||||
};
|
||||
|
||||
// make a list of all extensions to use
|
||||
std::vector<const char*> extensions{};
|
||||
extensions.insert(extensions.end(), windowExtensions.begin(), windowExtensions.end());
|
||||
|
||||
std::vector<const char*> layers{};
|
||||
|
||||
if (m_validationLayer.has_value()) {
|
||||
layers.push_back(m_validationLayer.value()->layerName);
|
||||
extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
|
||||
}
|
||||
|
||||
VkInstanceCreateInfo instanceInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.pApplicationInfo = &applicationInfo,
|
||||
.enabledLayerCount = (uint32_t)layers.size(),
|
||||
.ppEnabledLayerNames = layers.data(),
|
||||
.enabledExtensionCount = (uint32_t)extensions.size(),
|
||||
.ppEnabledExtensionNames = extensions.data(),
|
||||
};
|
||||
|
||||
if (m_validationLayer.has_value()) {
|
||||
VkDebugUtilsMessengerCreateInfoEXT debugMessengerCreateInfo = DebugMessenger::getCreateInfo();
|
||||
instanceInfo.pNext = &debugMessengerCreateInfo;
|
||||
}
|
||||
|
||||
#ifndef NDEBUG
|
||||
for (const char* ext : extensions) {
|
||||
TRACE("Using Vulkan instance extension: {}", ext);
|
||||
}
|
||||
#endif
|
||||
|
||||
res = vkCreateInstance(&instanceInfo, nullptr, &m_handle);
|
||||
if (res == VK_ERROR_INCOMPATIBLE_DRIVER) {
|
||||
CRITICAL("The graphics driver is incompatible with vulkan");
|
||||
throw std::runtime_error("Graphics driver is incompatible with Vulkan");
|
||||
}
|
||||
assert(res == VK_SUCCESS);
|
||||
|
||||
volkLoadInstance(m_handle);
|
||||
|
||||
}
|
||||
|
||||
~Instance()
|
||||
{
|
||||
vkDestroyInstance(m_handle, nullptr);
|
||||
}
|
||||
|
||||
VkInstance getHandle()
|
||||
{
|
||||
return m_handle;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
VkInstance m_handle;
|
||||
|
||||
std::vector<VkLayerProperties> m_layersAvailable{};
|
||||
static constexpr const char* VALIDATION_LAYER_NAME = "VK_LAYER_KHRONOS_validation";
|
||||
std::optional<std::vector<VkLayerProperties>::iterator> m_validationLayer;
|
||||
|
||||
void findAvailableLayers()
|
||||
{
|
||||
VkResult res;
|
||||
|
||||
uint32_t layerCount;
|
||||
res = vkEnumerateInstanceLayerProperties(&layerCount, nullptr);
|
||||
assert(res == VK_SUCCESS);
|
||||
m_layersAvailable.resize(layerCount);
|
||||
res = vkEnumerateInstanceLayerProperties(&layerCount, m_layersAvailable.data());
|
||||
assert(res == VK_SUCCESS);
|
||||
|
||||
#ifndef NDEBUG
|
||||
// find validation layer and print all layers to log
|
||||
for (auto it = m_layersAvailable.begin(); it != m_layersAvailable.end(); it++) {
|
||||
// TRACE("Found Vulkan layer: {}, {}", it->layerName, it->description);
|
||||
if (strncmp(it->layerName, VALIDATION_LAYER_NAME, 256) == 0) {
|
||||
m_validationLayer = it;
|
||||
}
|
||||
}
|
||||
if (m_validationLayer.has_value() == false) {
|
||||
CRITICAL("The validation layer was not found. Quitting.");
|
||||
throw std::runtime_error("Validation layer not found");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#ifndef NDEBUG
|
||||
class DebugMessenger {
|
||||
|
||||
public:
|
||||
DebugMessenger(const VkInstance& instance) : m_instance(instance)
|
||||
{
|
||||
VkDebugUtilsMessengerCreateInfoEXT createInfo = getCreateInfo();
|
||||
|
||||
VkResult res = vkCreateDebugUtilsMessengerEXT(instance, &createInfo, nullptr, &m_debugMessenger);
|
||||
assert(res == VK_SUCCESS);
|
||||
}
|
||||
|
||||
~DebugMessenger()
|
||||
{
|
||||
vkDestroyDebugUtilsMessengerEXT(m_instance, m_debugMessenger, nullptr);
|
||||
}
|
||||
|
||||
static VkDebugUtilsMessengerCreateInfoEXT getCreateInfo()
|
||||
{
|
||||
VkDebugUtilsMessengerCreateInfoEXT createInfo{
|
||||
.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT,
|
||||
.pNext = nullptr,
|
||||
.flags = 0,
|
||||
.messageSeverity = 0,
|
||||
.messageType =
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT |
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT |
|
||||
VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT,
|
||||
.pfnUserCallback = debugMessenger,
|
||||
.pUserData = nullptr,
|
||||
};
|
||||
|
||||
switch (MESSAGE_LEVEL) {
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT;
|
||||
// fall-through
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT;
|
||||
// fall-through
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT;
|
||||
// fall-through
|
||||
case VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT:
|
||||
createInfo.messageSeverity |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
|
||||
// fall-through
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return createInfo;
|
||||
}
|
||||
|
||||
private:
|
||||
VkDebugUtilsMessengerEXT m_debugMessenger;
|
||||
const VkInstance& m_instance;
|
||||
|
||||
};
|
||||
#endif
|
||||
|
||||
std::unique_ptr<Instance> m_instance;
|
||||
#ifndef NDEBUG
|
||||
std::shared_ptr<Instance> m_instance;
|
||||
std::unique_ptr<DebugMessenger> m_debugMessenger;
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
@ -291,12 +295,11 @@ namespace engine::gfx {
|
||||
|
||||
pimpl = std::make_unique<Impl>(appInfo, window);
|
||||
|
||||
//pimpl->createDebugMessenger();
|
||||
|
||||
}
|
||||
|
||||
Device::~Device()
|
||||
{
|
||||
//pimpl->cleanup();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user