From 6d7326b5bb3ba46a7b89fccde407790dff502e77 Mon Sep 17 00:00:00 2001 From: daiqingshuang Date: Mon, 19 Feb 2024 16:46:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=B9=B6=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/application/application.cpp | 4 +- .../{renderer_vulkan.cpp => renderer_vk.cpp} | 38 +++++++++---------- .../{renderer_vulkan.h => renderer_vk.h} | 2 +- core/rhi/vulkan/test_vulkan.cpp | 8 ---- core/rhi/vulkan/test_vulkan.h | 17 --------- 5 files changed, 22 insertions(+), 47 deletions(-) rename core/rhi/vulkan/{renderer_vulkan.cpp => renderer_vk.cpp} (91%) rename core/rhi/vulkan/{renderer_vulkan.h => renderer_vk.h} (97%) delete mode 100644 core/rhi/vulkan/test_vulkan.cpp delete mode 100644 core/rhi/vulkan/test_vulkan.h diff --git a/core/application/application.cpp b/core/application/application.cpp index 488f499..60f669f 100644 --- a/core/application/application.cpp +++ b/core/application/application.cpp @@ -8,7 +8,7 @@ #include "filesystem/stb_image.h" #include "rhi/texture.h" #include "rhi/opengl/renderer_opengl.h" -#include "rhi/vulkan/renderer_vulkan.h" +#include "rhi/vulkan/renderer_vk.h" #include "spdlog/async.h" #include "spdlog/spdlog.h" #include "spdlog/sinks/basic_file_sink.h" @@ -32,7 +32,7 @@ void application::init(window_params in_window_params, int argc, char** argv) { init_glfw(); init_imgui(); - renderer_ = new renderer_vulkan(); + renderer_ = new renderer_vk(); renderer_->pre_init(); diff --git a/core/rhi/vulkan/renderer_vulkan.cpp b/core/rhi/vulkan/renderer_vk.cpp similarity index 91% rename from core/rhi/vulkan/renderer_vulkan.cpp rename to core/rhi/vulkan/renderer_vk.cpp index 1e3cee6..b8534e0 100644 --- a/core/rhi/vulkan/renderer_vulkan.cpp +++ b/core/rhi/vulkan/renderer_vk.cpp @@ -1,4 +1,4 @@ -#include "renderer_vulkan.h" +#include "renderer_vk.h" #include "imgui_impl_glfw.h" #include "utils/utils.hpp" @@ -26,7 +26,7 @@ static bool is_extension_available(const std::vector& p }); } -vk::PhysicalDevice renderer_vulkan::setup_vulkan_select_physical_device() const { +vk::PhysicalDevice renderer_vk::setup_vulkan_select_physical_device() const { const std::vector gpus = instance.enumeratePhysicalDevices(); IM_ASSERT(!gpus.empty()); @@ -46,7 +46,7 @@ vk::PhysicalDevice renderer_vulkan::setup_vulkan_select_physical_device() const return VK_NULL_HANDLE; } -void renderer_vulkan::setup_vulkan(ImVector instance_extensions) { +void renderer_vk::setup_vulkan(ImVector instance_extensions) { // Create Vulkan Instance { VkInstanceCreateInfo create_info = {}; @@ -121,7 +121,7 @@ void renderer_vulkan::setup_vulkan(ImVector instance_extensions) { // All the ImGui_ImplVulkanH_XXX structures/functions are optional helpers used by the demo. // Your real engine/app may not use them. -void renderer_vulkan::setup_vulkan_window(VkSurfaceKHR surface, int width, +void renderer_vk::setup_vulkan_window(VkSurfaceKHR surface, int width, int height) { main_window_data.Surface = surface; @@ -161,7 +161,7 @@ void renderer_vulkan::setup_vulkan_window(VkSurfaceKHR surface, int width, height, min_image_count); } -void renderer_vulkan::cleanup_vulkan() const { +void renderer_vk::cleanup_vulkan() const { device.destroyDescriptorPool(descriptor_pool); #ifdef APP_USE_VULKAN_DEBUG_REPORT // Remove the debug report callback @@ -173,12 +173,12 @@ void renderer_vulkan::cleanup_vulkan() const { instance.destroy(); } -void renderer_vulkan::cleanup_vulkan_window() { +void renderer_vk::cleanup_vulkan_window() { ImGui_ImplVulkanH_DestroyWindow(instance, device, &main_window_data, reinterpret_cast(allocator)); } -void renderer_vulkan::frame_render(ImGui_ImplVulkanH_Window* wd, ImDrawData* draw_data) { +void renderer_vk::frame_render(ImGui_ImplVulkanH_Window* wd, ImDrawData* draw_data) { vk::Semaphore image_acquired_semaphore = wd->FrameSemaphores[wd->SemaphoreIndex].ImageAcquiredSemaphore; vk::Semaphore render_complete_semaphore = wd->FrameSemaphores[wd->SemaphoreIndex].RenderCompleteSemaphore; @@ -253,7 +253,7 @@ void renderer_vulkan::frame_render(ImGui_ImplVulkanH_Window* wd, ImDrawData* dra } } -void renderer_vulkan::frame_present(ImGui_ImplVulkanH_Window* wd) { +void renderer_vk::frame_present(ImGui_ImplVulkanH_Window* wd) { if (swap_chain_rebuild) return; vk::Semaphore render_complete_semaphore = wd->FrameSemaphores[wd->SemaphoreIndex].RenderCompleteSemaphore; @@ -274,12 +274,12 @@ void renderer_vulkan::frame_present(ImGui_ImplVulkanH_Window* wd) { wd->SemaphoreIndex = (wd->SemaphoreIndex + 1) % wd->SemaphoreCount; // Now we can use the next set of semaphores } -void renderer_vulkan::pre_init() { +void renderer_vk::pre_init() { renderer::pre_init(); glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API); } -bool renderer_vulkan::init(GLFWwindow* window_handle) { +bool renderer_vk::init(GLFWwindow* window_handle) { if (has_initialized_) return true; @@ -292,29 +292,29 @@ bool renderer_vulkan::init(GLFWwindow* window_handle) { return true; } -void renderer_vulkan::shutdown() { +void renderer_vk::shutdown() { renderer::shutdown(); ImGui_ImplGlfw_Shutdown(); ImGui_ImplVulkan_Shutdown(); } -std::shared_ptr renderer_vulkan::load_shader(const std::string& entry_name) { +std::shared_ptr renderer_vk::load_shader(const std::string& entry_name) { return nullptr; } -std::shared_ptr renderer_vulkan::create_pixel_shader_drawer() { +std::shared_ptr renderer_vk::create_pixel_shader_drawer() { return nullptr; } -void renderer_vulkan::new_frame(GLFWwindow* window_handle) { +void renderer_vk::new_frame(GLFWwindow* window_handle) { // Start the Dear ImGui frame ImGui_ImplVulkan_NewFrame(); ImGui_ImplGlfw_NewFrame(); ImGui::NewFrame(); } -void renderer_vulkan::end_frame(GLFWwindow* window_handle) { +void renderer_vk::end_frame(GLFWwindow* window_handle) { ImGuiIO& io = ImGui::GetIO(); // Rendering @@ -340,18 +340,18 @@ void renderer_vulkan::end_frame(GLFWwindow* window_handle) { frame_present(&main_window_data); } -void renderer_vulkan::resize(int width, int height) { +void renderer_vk::resize(int width, int height) { } -std::shared_ptr renderer_vulkan::create_texture(const unsigned char* data, int width, int height) { +std::shared_ptr renderer_vk::create_texture(const unsigned char* data, int width, int height) { return nullptr; } -std::shared_ptr renderer_vulkan::create_render_target(int width, int height, texture_format format) { +std::shared_ptr renderer_vk::create_render_target(int width, int height, texture_format format) { return nullptr; } -void renderer_vulkan::init_vulkan(GLFWwindow* window_handle) { +void renderer_vk::init_vulkan(GLFWwindow* window_handle) { ImVector extensions; uint32_t extensions_count = 0; const char** glfw_extensions = glfwGetRequiredInstanceExtensions(&extensions_count); diff --git a/core/rhi/vulkan/renderer_vulkan.h b/core/rhi/vulkan/renderer_vk.h similarity index 97% rename from core/rhi/vulkan/renderer_vulkan.h rename to core/rhi/vulkan/renderer_vk.h index a8aa6c0..5027af7 100644 --- a/core/rhi/vulkan/renderer_vulkan.h +++ b/core/rhi/vulkan/renderer_vk.h @@ -9,7 +9,7 @@ #include "rhi/renderer.h" -class renderer_vulkan : public renderer { +class renderer_vk : public renderer { public: void pre_init() override; diff --git a/core/rhi/vulkan/test_vulkan.cpp b/core/rhi/vulkan/test_vulkan.cpp deleted file mode 100644 index b1d1b43..0000000 --- a/core/rhi/vulkan/test_vulkan.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// -// Created by 46944 on 2024/2/19. -// - -#include "test_vulkan.h" - -test_vulkan::test_vulkan() { -} diff --git a/core/rhi/vulkan/test_vulkan.h b/core/rhi/vulkan/test_vulkan.h deleted file mode 100644 index cb7589d..0000000 --- a/core/rhi/vulkan/test_vulkan.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// Created by 46944 on 2024/2/19. -// - -#ifndef TEST_VULKAN_H -#define TEST_VULKAN_H - -#include - -class CORE_API test_vulkan { -public: - test_vulkan(); -}; - - - -#endif //TEST_VULKAN_H