mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-24 19:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed vulkan issues with latest sdl3

Browse Source
This commit is contained in:
georgemoralis 2024-03-15 13:47:31 +02:00
parent c6262eb085
commit 716eb09d3c
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emulator.h
View File

@ -15,7 +15,8 @@ namespace Emu {
struct VulkanExt { struct VulkanExt {
bool enable_validation_layers = false; bool enable_validation_layers = false;
std::vector<const char*> required_extensions; char const* const* required_extensions;
u32 required_extensions_count;
std::vector<VkExtensionProperties> available_extensions; std::vector<VkExtensionProperties> available_extensions;
std::vector<const char*> required_layers; std::vector<const char*> required_layers;
std::vector<VkLayerProperties> available_layers; std::vector<VkLayerProperties> available_layers;

22
src/vulkan_util.cpp
View File

@ -32,16 +32,16 @@ void Graphics::Vulkan::vulkanCreate(Emu::WindowCtx* ctx) {
inst_info.pNext = nullptr; inst_info.pNext = nullptr;
inst_info.flags = 0; inst_info.flags = 0;
inst_info.pApplicationInfo = &app_info; inst_info.pApplicationInfo = &app_info;
inst_info.enabledExtensionCount = ext.required_extensions.size(); inst_info.enabledExtensionCount = ext.required_extensions_count;
inst_info.ppEnabledExtensionNames = ext.required_extensions.data(); inst_info.ppEnabledExtensionNames = ext.required_extensions;
inst_info.enabledLayerCount = 0; inst_info.enabledLayerCount = 0;
inst_info.ppEnabledLayerNames = nullptr; inst_info.ppEnabledLayerNames = nullptr;
const VkResult result = vkCreateInstance(&inst_info, nullptr, &ctx->m_graphic_ctx.m_instance); const VkResult result = vkCreateInstance(&inst_info, nullptr, &ctx->m_graphic_ctx.m_instance);
ASSERT_MSG(result == VK_SUCCESS, "Can't create an vulkan instance"); ASSERT_MSG(result == VK_SUCCESS, "Can't create an vulkan instance");
if (SDL_Vulkan_CreateSurface(ctx->m_window, ctx->m_graphic_ctx.m_instance, &ctx->m_surface) == if (SDL_Vulkan_CreateSurface(ctx->m_window, ctx->m_graphic_ctx.m_instance, NULL,
SDL_FALSE) { &ctx->m_surface) == SDL_FALSE) {
UNREACHABLE_MSG("Can't create an vulkan surface"); UNREACHABLE_MSG("Can't create an vulkan surface");
} }
@ -243,12 +243,8 @@ void Graphics::Vulkan::vulkanGetInstanceExtensions(Emu::VulkanExt* ext) {
u32 required_extensions_count = 0; u32 required_extensions_count = 0;
u32 available_extensions_count = 0; u32 available_extensions_count = 0;
u32 available_layers_count = 0; u32 available_layers_count = 0;
auto result = SDL_Vulkan_GetInstanceExtensions(&required_extensions_count, nullptr); ext->required_extensions = SDL_Vulkan_GetInstanceExtensions(&required_extensions_count);
ext->required_extensions_count = required_extensions_count;
ext->required_extensions = std::vector<const char*>(required_extensions_count);
result = SDL_Vulkan_GetInstanceExtensions(&required_extensions_count,
ext->required_extensions.data());
vkEnumerateInstanceExtensionProperties(nullptr, &available_extensions_count, nullptr); vkEnumerateInstanceExtensionProperties(nullptr, &available_extensions_count, nullptr);
@ -261,9 +257,9 @@ void Graphics::Vulkan::vulkanGetInstanceExtensions(Emu::VulkanExt* ext) {
ext->available_layers = std::vector<VkLayerProperties>(available_layers_count); ext->available_layers = std::vector<VkLayerProperties>(available_layers_count);
vkEnumerateInstanceLayerProperties(&available_layers_count, ext->available_layers.data()); vkEnumerateInstanceLayerProperties(&available_layers_count, ext->available_layers.data());
for (const char* ext : ext->required_extensions) { // for (const char* ext : ext->required_extensions) {
LOG_INFO(Render_Vulkan, "Vulkan required extension = {}", ext); // LOG_INFO(Render_Vulkan, "Vulkan required extension = {}", ext);
} //}
for (const auto& ext : ext->available_extensions) { for (const auto& ext : ext->available_extensions) {
LOG_INFO(Render_Vulkan, "Vulkan available extension: {}, version = {}", ext.extensionName, LOG_INFO(Render_Vulkan, "Vulkan available extension: {}, version = {}", ext.extensionName,