Jiga228/UwU-Engine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Вынес управление VkInstance в отдельный класс

Browse Source
This commit is contained in:
Jiga228
2026-06-23 17:46:21 +07:00
parent 280f843fb7
commit 7aec01ccc8
7 changed files with 130 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Core/CoreInstance.hpp
-2
View File
@@ -10,7 +10,6 @@
class SaveMap;
class RenderEngineBase;
class GameInstance;
struct GLFWwindow;
/*
* Внимательно следите, что бы у ваших объектов была "мягкая" зависимость
@@ -42,7 +41,6 @@ class CoreInstance {
double memorySize_ = 0;
std::list<Module> modules_;
GLFWwindow* window_ = nullptr;
RenderEngineBase* render_engine_ = nullptr;
GameInstance* game_ = nullptr;
RenderEngineSDK/RenderEngineBase.cpp
+4 -2
View File
@@ -2,7 +2,9 @@
#include <stdexcept>
RenderEngineBase::RenderEngineBase()
#include "Core/CoreInstance.hpp"
RenderEngineBase::RenderEngineBase(CoreInstance& core)
{
if (!glfwInit())
throw std::runtime_error("Fail init glfw");
@@ -10,7 +12,7 @@ RenderEngineBase::RenderEngineBase()
glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
window_ = glfwCreateWindow(800, 600, "UwU Engine", nullptr, nullptr);
window_ = glfwCreateWindow(800, 600, core.getGameName().c_str(), nullptr, nullptr);
if (window_ == nullptr)
throw std::runtime_error("Fail create window");
}
RenderEngineSDK/RenderEngineBase.hpp
+1 -1
View File
@@ -10,7 +10,7 @@ class RenderEngineBase
GLFWwindow* window_ = nullptr;
public:
explicit RenderEngineBase();
explicit RenderEngineBase(CoreInstance& core);
virtual ~RenderEngineBase();
virtual void start() = 0;
UwURenderEngine/RenderEngine/UwURenderEngine.cpp
+6 -88
View File
@@ -24,26 +24,6 @@ const std::vector<const char*> UwURenderEngine::deviceExtensions = {
RENDER_ENGINE_FACTORY_GENERATE(UwURenderEngine)
#ifdef _DEBUG
static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
VkDebugUtilsMessageTypeFlagsEXT messageType,
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
void* pUserData) {
std::string msg = "validation layer: ";
msg += pCallbackData->pMessage;
Loging::Log(msg);
return VK_FALSE;
}
VkResult UwURenderEngine::enable_layer_validation(const VkDebugUtilsMessengerCreateInfoEXT* create_info)
{
PFN_vkCreateDebugUtilsMessengerEXT debug_creator = reinterpret_cast<PFN_vkCreateDebugUtilsMessengerEXT>(vkGetInstanceProcAddr(instance_, "vkCreateDebugUtilsMessengerEXT"));
return debug_creator(instance_, create_info, nullptr, &debug_messenger_);
}
#endif
UwURenderEngine::SwapchainSupportDetails UwURenderEngine::query_swapchain_details() const
{
@@ -64,18 +44,6 @@ UwURenderEngine::SwapchainSupportDetails UwURenderEngine::query_swapchain_detail
return details;
}
std::vector<const char*> UwURenderEngine::get_required_extensions()
{
uint32_t extensions_count = 0;
const char** glfw_extension = glfwGetRequiredInstanceExtensions(&extensions_count);
std::vector<const char*> extensions(glfw_extension, glfw_extension + extensions_count);
#ifdef _DEBUG
extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
#endif
return extensions;
}
bool UwURenderEngine::is_device_suitable(VkPhysicalDevice device, VkSurfaceKHR surface)
{
VkPhysicalDeviceProperties device_properties;
@@ -221,50 +189,13 @@ VkShaderModule UwURenderEngine::create_shader_module(const std::string& code) co
return shader_module;
}
void UwURenderEngine::create_instance()
{
std::vector<const char*> extensions = get_required_extensions();
VkApplicationInfo app_info{};
app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
app_info.apiVersion = VK_API_VERSION_1_0;
app_info.applicationVersion = VK_MAKE_VERSION(0, 0, 0);
app_info.pApplicationName = core_.getGameName().c_str();
app_info.pEngineName = "UwU Engine";
app_info.engineVersion = VK_MAKE_VERSION(0, 0, 0);
VkInstanceCreateInfo instance_create_info{};
instance_create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
instance_create_info.pApplicationInfo = &app_info;
instance_create_info.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
instance_create_info.ppEnabledExtensionNames = extensions.data();
#ifdef _DEBUG
const std::vector<const char*> layers_validation = {
"VK_LAYER_KHRONOS_validation"
};
instance_create_info.enabledLayerCount = static_cast<uint32_t>(layers_validation.size());
instance_create_info.ppEnabledLayerNames = layers_validation.data();
VkDebugUtilsMessengerCreateInfoEXT debug_messenger_create_info{};
debug_messenger_create_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
debug_messenger_create_info.messageSeverity = VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
debug_messenger_create_info.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;
debug_messenger_create_info.pfnUserCallback = &debugCallback;
instance_create_info.pNext = &debug_messenger_create_info;
#endif
VK_CHECK(vkCreateInstance(&instance_create_info, nullptr, &instance_))
#ifdef _DEBUG
VK_CHECK(enable_layer_validation(&debug_messenger_create_info))
#endif
}
void UwURenderEngine::pick_physical_device()
{
uint32_t device_count = 0;
std::vector<VkPhysicalDevice> devices;
VK_CHECK(vkEnumeratePhysicalDevices(instance_, &device_count, nullptr))
VK_CHECK(vkEnumeratePhysicalDevices(instance_.get_native(), &device_count, nullptr))
devices.resize(device_count);
VK_CHECK(vkEnumeratePhysicalDevices(instance_, &device_count, devices.data()))
VK_CHECK(vkEnumeratePhysicalDevices(instance_.get_native(), &device_count, devices.data()))
for (const auto& device : devices)
{
@@ -943,16 +874,13 @@ void UwURenderEngine::draw_frame()
void UwURenderEngine::create_surface()
{
VK_CHECK(glfwCreateWindowSurface(instance_, get_window(), nullptr, &surface_))
VK_CHECK(glfwCreateWindowSurface(instance_.get_native(), get_window(), nullptr, &surface_))
}
UwURenderEngine::UwURenderEngine(CoreInstance& core):
UwURenderEngine::UwURenderEngine(CoreInstance& core):RenderEngineBase(core),
instance_(core),
core_(core)
#ifdef _DEBUG
,debug_messenger_(nullptr)
#endif
{
create_instance();
create_surface();
pick_physical_device();
create_logical_device();
@@ -1044,17 +972,7 @@ UwURenderEngine::~UwURenderEngine()
vkDestroyDevice(device_, nullptr);
if (surface_ != VK_NULL_HANDLE)
vkDestroySurfaceKHR(instance_, surface_, nullptr);
#ifdef _DEBUG
if (debug_messenger_ != nullptr && instance_ != nullptr) {
PFN_vkDestroyDebugUtilsMessengerEXT destroyer_messenger = reinterpret_cast<PFN_vkDestroyDebugUtilsMessengerEXT>(vkGetInstanceProcAddr(instance_, "vkDestroyDebugUtilsMessengerEXT"));
destroyer_messenger(instance_, debug_messenger_, nullptr);
}
#endif
if (instance_ != VK_NULL_HANDLE)
vkDestroyInstance(instance_, nullptr);
vkDestroySurfaceKHR(instance_.get_native(), surface_, nullptr);
}
void UwURenderEngine::start()
UwURenderEngine/RenderEngine/UwURenderEngine.hpp
+3 -7
View File
@@ -11,6 +11,8 @@
#include <mutex>
#include <glm/glm.hpp>
#include "VkObjects/Instance.hpp"
class Camera;
class GPU_GarbageCollector;
@@ -69,7 +71,7 @@ class UwURenderEngine : public RenderEngineBase
std::weak_ptr<Camera> active_camera_;
std::mutex m_active_camera_;
VkInstance instance_ = VK_NULL_HANDLE;
Instance instance_;
VkSurfaceKHR surface_ = VK_NULL_HANDLE;
VkPhysicalDevice physical_device_ = VK_NULL_HANDLE;
VkDevice device_ = VK_NULL_HANDLE;
@@ -102,13 +104,8 @@ class UwURenderEngine : public RenderEngineBase
std::vector<VkSemaphore> image_available_semaphores_, render_finished_semaphores_;
std::vector<VkFence> in_flight_fences_;
#ifdef _DEBUG
VkResult enable_layer_validation(const VkDebugUtilsMessengerCreateInfoEXT* create_info);
VkDebugUtilsMessengerEXT debug_messenger_;
#endif
SwapchainSupportDetails query_swapchain_details() const;
static std::vector<const char*> get_required_extensions();
static bool is_device_suitable(VkPhysicalDevice device, VkSurfaceKHR surface);
static bool check_device_extensions_support(VkPhysicalDevice device);
static QueueFamilyIndices find_queue_family_indices(VkPhysicalDevice physical_device, VkSurfaceKHR surface);
@@ -117,7 +114,6 @@ class UwURenderEngine : public RenderEngineBase
VkShaderModule create_shader_module(const std::string& code) const;
static std::vector<uint32_t> get_unique_family_indices(const QueueFamilyIndices& indices);
void create_instance();
void create_surface();
void pick_physical_device();
void create_logical_device();
UwURenderEngine/RenderEngine/VkObjects/Instance.cpp
+86
View File
@@ -0,0 +1,86 @@
#include "Instance.hpp"
#include "Core/CoreInstance.hpp"
#include "DeviceFunctions/DeviceFunctions.hpp"
#include "Log/Log.hpp"
#ifdef _DEBUG
VkBool32 Instance::debugCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
VkDebugUtilsMessageTypeFlagsEXT messageType,
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
void* pUserData) {
std::string msg = "validation layer: ";
msg += pCallbackData->pMessage;
Loging::Log(msg);
return VK_FALSE;
}
VkResult Instance::enable_layer_validation(const VkDebugUtilsMessengerCreateInfoEXT* create_info)
{
PFN_vkCreateDebugUtilsMessengerEXT debug_creator = reinterpret_cast<PFN_vkCreateDebugUtilsMessengerEXT>(vkGetInstanceProcAddr(instance_, "vkCreateDebugUtilsMessengerEXT"));
return debug_creator(instance_, create_info, nullptr, &debug_messenger_);
}
#endif
std::vector<const char*> Instance::get_required_extensions()
{
uint32_t extensions_count = 0;
const char** glfw_extension = glfwGetRequiredInstanceExtensions(&extensions_count);
std::vector<const char*> extensions(glfw_extension, glfw_extension + extensions_count);
#ifdef _DEBUG
extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
#endif
return extensions;
}
Instance::Instance(CoreInstance& core)
{
std::vector<const char*> extensions = get_required_extensions();
VkApplicationInfo app_info{};
app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
app_info.apiVersion = VK_API_VERSION_1_0;
app_info.applicationVersion = VK_MAKE_VERSION(0, 0, 0);
app_info.pApplicationName = core.getGameName().c_str();
app_info.pEngineName = "UwU Engine";
app_info.engineVersion = VK_MAKE_VERSION(0, 0, 0);
VkInstanceCreateInfo instance_create_info{};
instance_create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
instance_create_info.pApplicationInfo = &app_info;
instance_create_info.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
instance_create_info.ppEnabledExtensionNames = extensions.data();
#ifdef _DEBUG
const std::vector<const char*> layers_validation = {
"VK_LAYER_KHRONOS_validation"
};
instance_create_info.enabledLayerCount = static_cast<uint32_t>(layers_validation.size());
instance_create_info.ppEnabledLayerNames = layers_validation.data();
VkDebugUtilsMessengerCreateInfoEXT debug_messenger_create_info{};
debug_messenger_create_info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
debug_messenger_create_info.messageSeverity = VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT | VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
debug_messenger_create_info.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;
debug_messenger_create_info.pfnUserCallback = &Instance::debugCallback;
instance_create_info.pNext = &debug_messenger_create_info;
#endif
VK_CHECK(vkCreateInstance(&instance_create_info, nullptr, &instance_))
#ifdef _DEBUG
VK_CHECK(enable_layer_validation(&debug_messenger_create_info))
#endif
}
Instance::~Instance()
{
#ifdef _DEBUG
if (debug_messenger_ != nullptr && instance_ != nullptr) {
PFN_vkDestroyDebugUtilsMessengerEXT destroyer_messenger = reinterpret_cast<PFN_vkDestroyDebugUtilsMessengerEXT>(vkGetInstanceProcAddr(instance_, "vkDestroyDebugUtilsMessengerEXT"));
destroyer_messenger(instance_, debug_messenger_, nullptr);
}
#endif
vkDestroyInstance(instance_, nullptr);
}
UwURenderEngine/RenderEngine/VkObjects/Instance.hpp
+30
View File
@@ -0,0 +1,30 @@
#pragma once
#include <vulkan/vulkan.h>
#include <vector>
class CoreInstance;
class Instance
{
VkInstance instance_ = nullptr;
static VKAPI_ATTR VkBool32 VKAPI_CALL debugCallback(
VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity,
VkDebugUtilsMessageTypeFlagsEXT messageType,
const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData,
void* pUserData
);
#ifdef _DEBUG
VkResult enable_layer_validation(const VkDebugUtilsMessengerCreateInfoEXT* create_info);
VkDebugUtilsMessengerEXT debug_messenger_;
#endif
std::vector<const char*> Instance::get_required_extensions();
public:
Instance(CoreInstance& core);
~Instance();
inline VkInstance get_native() const { return instance_; }
};