mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Fix segfault on nVidia.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2016-03-06 12:33:46 +01:00
parent c00d32f30f
commit f02faeea27
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/common/vulkan_common.c
View File

@ -1234,7 +1234,6 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
RARCH_LOG("Vulkan dynamic library loaded.\n"); RARCH_LOG("Vulkan dynamic library loaded.\n");
VKSYM(vk, CreateInstance);
VKSYM(vk, GetInstanceProcAddr); VKSYM(vk, GetInstanceProcAddr);
app.pApplicationName = "RetroArch"; app.pApplicationName = "RetroArch";
@ -1254,7 +1253,12 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
res = VK_SUCCESS; res = VK_SUCCESS;
} }
else else
{
/* This will be called with a NULL instance, which
* is what we want. */
VK_GET_INSTANCE_PROC_ADDR(CreateInstance);
res = VKFUNC(vkCreateInstance)(&info, NULL, &vk->context.instance); res = VKFUNC(vkCreateInstance)(&info, NULL, &vk->context.instance);
}
/* Try different API versions if driver has compatible /* Try different API versions if driver has compatible
* but slightly different VK_API_VERSION. */ * but slightly different VK_API_VERSION. */

3
gfx/drivers/vulkan.c
View File

@ -73,7 +73,8 @@ static const gfx_ctx_driver_t *vulkan_get_context(vk_t *vk)
static void vulkan_init_render_pass( static void vulkan_init_render_pass(
vk_t *vk) vk_t *vk)
{ {
VkRenderPassCreateInfo rp_info; VkRenderPassCreateInfo rp_info = {
VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO };
VkAttachmentDescription attachment = {0}; VkAttachmentDescription attachment = {0};
VkSubpassDescription subpass = {0}; VkSubpassDescription subpass = {0};
VkAttachmentReference color_ref = { 0, VkAttachmentReference color_ref = { 0,