Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-23 14:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libretro: Fix Vulkan context creation on Mali

Browse source 
We don't use the loader functions here anyway, so no need to try to
retrieve them.
This commit is contained in:
Connor McLaughlin 2020-07-12 00:41:52 +10:00
parent 3ad780b52e
commit 113b0f57d6
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/duckstation-libretro/libretro_vulkan_host_display.cpp
View file

@ -20,20 +20,6 @@ void LibretroVulkanHostDisplay::SetVSync(bool enabled)
Log_DevPrintf("Ignoring SetVSync(%u)", BoolToUInt32(enabled)); Log_DevPrintf("Ignoring SetVSync(%u)", BoolToUInt32(enabled));
} }
static bool LoadModuleFunctions(VkInstance instance, PFN_vkGetInstanceProcAddr get_instance_proc_addr)
{
#define VULKAN_MODULE_ENTRY_POINT(name, required) \
if (!name && (name = reinterpret_cast<decltype(name)>(get_instance_proc_addr(instance, #name))) == nullptr) \
{ \
Log_ErrorPrintf("Could not get function pointer for '%s'", #name); \
return false; \
}
#include "vulkan_entry_points.inl"
#undef VULKAN_MODULE_ENTRY_POINT
return true;
}
static bool RetroCreateVulkanDevice(struct retro_vulkan_context* context, VkInstance instance, VkPhysicalDevice gpu, static bool RetroCreateVulkanDevice(struct retro_vulkan_context* context, VkInstance instance, VkPhysicalDevice gpu,
VkSurfaceKHR surface, PFN_vkGetInstanceProcAddr get_instance_proc_addr, VkSurfaceKHR surface, PFN_vkGetInstanceProcAddr get_instance_proc_addr,
const char** required_device_extensions, unsigned num_required_device_extensions, const char** required_device_extensions, unsigned num_required_device_extensions,
@ -42,13 +28,6 @@ static bool RetroCreateVulkanDevice(struct retro_vulkan_context* context, VkInst
{ {
// We need some module functions. // We need some module functions.
vkGetInstanceProcAddr = get_instance_proc_addr; vkGetInstanceProcAddr = get_instance_proc_addr;
if (!LoadModuleFunctions(instance, get_instance_proc_addr))
{
Log_ErrorPrintf("Failed to load Vulkan module functions");
Vulkan::ResetVulkanLibraryFunctionPointers();
return false;
}
if (!Vulkan::LoadVulkanInstanceFunctions(instance)) if (!Vulkan::LoadVulkanInstanceFunctions(instance))
{ {
Log_ErrorPrintf("Failed to load Vulkan instance functions"); Log_ErrorPrintf("Failed to load Vulkan instance functions");
@ -175,7 +154,7 @@ bool LibretroVulkanHostDisplay::Render()
const u32 resolution_scale = g_libretro_host_interface.GetResolutionScale(); const u32 resolution_scale = g_libretro_host_interface.GetResolutionScale();
const u32 display_width = static_cast<u32>(m_display_width) * resolution_scale; const u32 display_width = static_cast<u32>(m_display_width) * resolution_scale;
const u32 display_height = static_cast<u32>(m_display_height) * resolution_scale; const u32 display_height = static_cast<u32>(m_display_height) * resolution_scale;
if (!CheckFramebufferSize(display_width, display_height)) if (display_width == 0 || display_height == 0 || !CheckFramebufferSize(display_width, display_height))
return false; return false;
VkCommandBuffer cmdbuffer = g_vulkan_context->GetCurrentCommandBuffer(); VkCommandBuffer cmdbuffer = g_vulkan_context->GetCurrentCommandBuffer();