almost finished vulkan init

src/emulator.cpp

@@ -2,24 +2,25 @@
 
 #include "Core/PS4/HLE/Graphics/video_out.h"
 #include <vulkan_util.h>
+#include <Util/Singleton.h>
 
 namespace Emulator {
 
-static WindowCtx* g_window_ctx = nullptr;
 bool m_emu_needs_exit = false;
 
 void emuInit(u32 width, u32 height) {
-    g_window_ctx = new WindowCtx;
+    auto* window_ctx = Singleton<Emulator::WindowCtx>::Instance();
 
-    g_window_ctx->m_graphic_ctx.screen_width = width;
+    window_ctx->m_graphic_ctx.screen_width = width;
-    g_window_ctx->m_graphic_ctx.screen_height = height;
+    window_ctx->m_graphic_ctx.screen_height = height;
 }
 
 void checkAndWaitForGraphicsInit() {
-    Lib::LockMutexGuard lock(g_window_ctx->m_mutex);
+    auto* window_ctx = Singleton<Emulator::WindowCtx>::Instance();
+    Lib::LockMutexGuard lock(window_ctx->m_mutex);
 
-    while (!g_window_ctx->m_is_graphic_initialized) {
+    while (!window_ctx->m_is_graphic_initialized) {
-        g_window_ctx->m_graphic_initialized_cond.WaitCondVar(&g_window_ctx->m_mutex);
+        window_ctx->m_graphic_initialized_cond.WaitCondVar(&window_ctx->m_mutex);
     }
 }
 static void CreateSdlWindow(WindowCtx* ctx) {
@@ -44,15 +45,16 @@ static void CreateSdlWindow(WindowCtx* ctx) {
     SDL_SetWindowResizable(ctx->m_window, SDL_FALSE);  // we don't support resizable atm
 }
 void emuRun() {
-    g_window_ctx->m_mutex.LockMutex();
+    auto* window_ctx = Singleton<Emulator::WindowCtx>::Instance();
+    window_ctx->m_mutex.LockMutex();
     {
         // init window and wait until init finishes
-        CreateSdlWindow(g_window_ctx);
+        CreateSdlWindow(window_ctx);
-        Graphics::Vulkan::vulkanCreate(g_window_ctx);
+        Graphics::Vulkan::vulkanCreate(window_ctx);
-        g_window_ctx->m_is_graphic_initialized = true;
+        window_ctx->m_is_graphic_initialized = true;
-        g_window_ctx->m_graphic_initialized_cond.SignalCondVar();
+        window_ctx->m_graphic_initialized_cond.SignalCondVar();
     }
-    g_window_ctx->m_mutex.UnlockMutex();
+    window_ctx->m_mutex.UnlockMutex();
 
     bool exit_loop = false;
 

src/emulator.h

@@ -43,6 +43,17 @@ struct VulkanQueues {
     std::vector<u32> family_used;
 };
 
+struct VulkanSwapchain {
+    VkSwapchainKHR swapchain = nullptr;
+    VkFormat swapchain_format = VK_FORMAT_UNDEFINED;
+    VkExtent2D swapchain_extent = {};
+    VkImage* swapchain_images = nullptr;
+    VkImageView* swapchain_image_views = nullptr;
+    u32 swapchain_images_count = 0;
+    VkSemaphore present_complete_semaphore = nullptr;
+    VkFence present_complete_fence = nullptr;
+    u32 current_index = 0;
+};
 
 struct WindowCtx {
     HLE::Libs::Graphics::GraphicCtx m_graphic_ctx;
@@ -53,6 +64,7 @@ struct WindowCtx {
     bool is_window_hidden = true;
     VkSurfaceKHR m_surface = nullptr;
     VulkanSurfaceCapabilities* m_surface_capabilities = nullptr;
+    VulkanSwapchain* swapchain = nullptr;
 };
 
 struct EmuPrivate {

src/vulkan_util.cpp

@@ -1,10 +1,11 @@
 #include "vulkan_util.h"
-
+#include <algorithm>
 #include <SDL_vulkan.h>
 #include <Util/log.h>
 #include <debug.h>
 #include <vulkan/vk_enum_string_helper.h>
 #include <vulkan/vulkan_core.h>
+#include <Util/Singleton.h>
 
 constexpr bool log_file_vulkanutil = true;  // disable it to disable logging
 
@@ -72,11 +73,116 @@ void Graphics::Vulkan::vulkanCreate(Emulator::WindowCtx* ctx) {
     }
 
     vulkanCreateQueues(&ctx->m_graphic_ctx, queues);
-
+    ctx->swapchain = vulkanCreateSwapchain(&ctx->m_graphic_ctx, 2);
 }
 
-void Graphics::Vulkan::vulkanCreateQueues(HLE::Libs::Graphics::GraphicCtx* ctx, const Emulator::VulkanQueues& queues) {
+Emulator::VulkanSwapchain* vulkanCreateSwapchain(HLE::Libs::Graphics::GraphicCtx* ctx, u32 image_count) {
+    auto* window_ctx = Singleton<Emulator::WindowCtx>::Instance();
+    Lib::LockMutexGuard lock(window_ctx->m_mutex);
 
+    auto* s = new Emulator::VulkanSwapchain;
+
+    VkExtent2D extent{};
+    extent.width = std::clamp(ctx->screen_width, window_ctx->m_surface_capabilities->capabilities.minImageExtent.width,
+                              window_ctx->m_surface_capabilities->capabilities.maxImageExtent.width);
+    extent.height = std::clamp(ctx->screen_height, window_ctx->m_surface_capabilities->capabilities.minImageExtent.height,
+                               window_ctx->m_surface_capabilities->capabilities.maxImageExtent.height);
+
+    image_count = std::clamp(image_count, window_ctx->m_surface_capabilities->capabilities.minImageCount,
+                             window_ctx->m_surface_capabilities->capabilities.maxImageCount);
+
+    VkSwapchainCreateInfoKHR create_info{};
+    create_info.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
+    create_info.pNext = nullptr;
+    create_info.flags = 0;
+    create_info.surface = window_ctx->m_surface;
+    create_info.minImageCount = image_count;
+
+    if (window_ctx->m_surface_capabilities->is_format_unorm_bgra32) {
+        create_info.imageFormat = VK_FORMAT_B8G8R8A8_UNORM;
+        create_info.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+    } else if (window_ctx->m_surface_capabilities->is_format_srgb_bgra32) {
+        create_info.imageFormat = VK_FORMAT_B8G8R8A8_SRGB;
+        create_info.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
+    } else {
+        create_info.imageFormat = window_ctx->m_surface_capabilities->formats.at(0).format;
+        create_info.imageColorSpace = window_ctx->m_surface_capabilities->formats.at(0).colorSpace;
+    }
+
+    create_info.imageExtent = extent;
+    create_info.imageArrayLayers = 1;
+    create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
+    create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;
+    create_info.queueFamilyIndexCount = 0;
+    create_info.pQueueFamilyIndices = nullptr;
+    create_info.preTransform = window_ctx->m_surface_capabilities->capabilities.currentTransform;
+    create_info.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR;
+    create_info.presentMode = VK_PRESENT_MODE_FIFO_KHR;
+    create_info.clipped = VK_TRUE;
+    create_info.oldSwapchain = nullptr;
+
+    s->swapchain_format = create_info.imageFormat;
+    s->swapchain_extent = extent;
+
+    VkSwapchainKHR swapchain = nullptr;
+
+    vkCreateSwapchainKHR(ctx->m_device, &create_info, nullptr, &swapchain);
+
+    vkGetSwapchainImagesKHR(ctx->m_device, swapchain, &s->swapchain_images_count, nullptr);
+
+    s->swapchain_images = new VkImage[s->swapchain_images_count];
+    vkGetSwapchainImagesKHR(ctx->m_device, swapchain, &s->swapchain_images_count, s->swapchain_images);
+
+    s->swapchain_image_views = new VkImageView[s->swapchain_images_count];
+    for (uint32_t i = 0; i < s->swapchain_images_count; i++) {
+        VkImageViewCreateInfo create_info{};
+        create_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+        create_info.pNext = nullptr;
+        create_info.flags = 0;
+        create_info.image = (s->swapchain_images)[i];
+        create_info.viewType = VK_IMAGE_VIEW_TYPE_2D;
+        create_info.format = s->swapchain_format;
+        create_info.components.r = VK_COMPONENT_SWIZZLE_IDENTITY;
+        create_info.components.g = VK_COMPONENT_SWIZZLE_IDENTITY;
+        create_info.components.b = VK_COMPONENT_SWIZZLE_IDENTITY;
+        create_info.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
+        create_info.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        create_info.subresourceRange.baseArrayLayer = 0;
+        create_info.subresourceRange.baseMipLevel = 0;
+        create_info.subresourceRange.layerCount = 1;
+        create_info.subresourceRange.levelCount = 1;
+
+        vkCreateImageView(ctx->m_device, &create_info, nullptr, &((s->swapchain_image_views)[i]));
+    }
+    if (s->swapchain == nullptr) {
+        LOG_CRITICAL_IF(log_file_vulkanutil, "Could not create swapchain\n");
+        std::exit(0);
+    }
+
+    s->current_index = static_cast<uint32_t>(-1);
+
+    VkSemaphoreCreateInfo present_complete_info{};
+    present_complete_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
+    present_complete_info.pNext = nullptr;
+    present_complete_info.flags = 0;
+
+    auto result = vkCreateSemaphore(ctx->m_device, &present_complete_info, nullptr, &s->present_complete_semaphore);
+
+    VkFenceCreateInfo fence_info{};
+    fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO;
+    fence_info.pNext = nullptr;
+    fence_info.flags = 0;
+
+    result = vkCreateFence(ctx->m_device, &fence_info, nullptr, &s->present_complete_fence);
+    if (result != VK_SUCCESS) {
+        LOG_CRITICAL_IF(log_file_vulkanutil, "Can't create vulkan fence\n");
+        std::exit(0);
+    }
+
+    return s;
+
+}
+void Graphics::Vulkan::vulkanCreateQueues(HLE::Libs::Graphics::GraphicCtx* ctx, const Emulator::VulkanQueues& queues) {
     auto get_queue = [ctx](int id, const Emulator::VulkanQueueInfo& info, bool with_mutex = false) {
         ctx->queues[id].family = info.family;
         ctx->queues[id].index = info.index;
@@ -98,7 +204,6 @@ void Graphics::Vulkan::vulkanCreateQueues(HLE::Libs::Graphics::GraphicCtx* ctx,
 
 VkDevice Graphics::Vulkan::vulkanCreateDevice(VkPhysicalDevice physical_device, VkSurfaceKHR surface, const Emulator::VulkanExt* r,
                                               const Emulator::VulkanQueues& queues, const std::vector<const char*>& device_extensions) {
-
     std::vector<VkDeviceQueueCreateInfo> queue_create_info(queues.family_count);
     std::vector<std::vector<float>> queue_priority(queues.family_count);
     uint32_t queue_create_info_num = 0;

src/vulkan_util.h

@@ -29,5 +29,5 @@ VkDevice vulkanCreateDevice(VkPhysicalDevice physical_device, VkSurfaceKHR surfa
 Emulator::VulkanQueues vulkanFindQueues(VkPhysicalDevice device, VkSurfaceKHR surface);
 void vulkanGetSurfaceCapabilities(VkPhysicalDevice physical_device, VkSurfaceKHR surface, Emulator::VulkanSurfaceCapabilities* surfaceCap);
 void vulkanCreateQueues(HLE::Libs::Graphics::GraphicCtx* ctx, const Emulator::VulkanQueues& queues);
-
+Emulator::VulkanSwapchain* vulkanCreateSwapchain(HLE::Libs::Graphics::GraphicCtx* ctx, u32 image_count);
 };  // namespace Graphics::Vulkan