mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Fix potential crash when toggling fullscreen.

Browse Source 
If we have HW rendering, and we toggle fullscreen while in the menu, we
don't have a ready HW image, so fall back to black dummy texture.
This commit is contained in:
Themaister 2018-12-12 13:22:24 +01:00
parent ac536cd28c
commit 077b108aa1
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gfx/common/vulkan_common.h
View File

@ -342,6 +342,7 @@ typedef struct vk
struct video_viewport vp; struct video_viewport vp;
struct vk_per_frame *chain; struct vk_per_frame *chain;
struct vk_per_frame swapchain[VULKAN_MAX_SWAPCHAIN_IMAGES]; struct vk_per_frame swapchain[VULKAN_MAX_SWAPCHAIN_IMAGES];
struct vk_texture default_texture;
/* Currently active command buffer. */ /* Currently active command buffer. */
VkCommandBuffer cmd; VkCommandBuffer cmd;

33
gfx/drivers/vulkan.c
View File

@ -645,6 +645,7 @@ static void vulkan_deinit_descriptor_pool(vk_t *vk)
static void vulkan_init_textures(vk_t *vk) static void vulkan_init_textures(vk_t *vk)
{ {
unsigned i; unsigned i;
const uint32_t zero = 0;
vulkan_init_samplers(vk); vulkan_init_samplers(vk);
if (!vk->hw.enable) if (!vk->hw.enable)
@ -665,6 +666,10 @@ static void vulkan_init_textures(vk_t *vk)
NULL, NULL, VULKAN_TEXTURE_DYNAMIC); NULL, NULL, VULKAN_TEXTURE_DYNAMIC);
} }
} }
vk->default_texture = vulkan_create_texture(vk, NULL,
1, 1, VK_FORMAT_B8G8R8A8_UNORM,
&zero, NULL, VULKAN_TEXTURE_STATIC);
} }
static void vulkan_deinit_textures(vk_t *vk) static void vulkan_deinit_textures(vk_t *vk)
@ -683,6 +688,9 @@ static void vulkan_deinit_textures(vk_t *vk)
vulkan_destroy_texture( vulkan_destroy_texture(
vk->context->device, &vk->swapchain[i].texture_optimal); vk->context->device, &vk->swapchain[i].texture_optimal);
} }
if (vk->default_texture.memory != VK_NULL_HANDLE)
vulkan_destroy_texture(vk->context->device, &vk->default_texture);
} }
static void vulkan_deinit_command_buffers(vk_t *vk) static void vulkan_deinit_command_buffers(vk_t *vk)
@ -1732,12 +1740,8 @@ static bool vulkan_frame(void *data, const void *frame,
if (vk->hw.enable) if (vk->hw.enable)
{ {
/* Does this make that this can happen at all? */ /* Does this make that this can happen at all? */
if (!vk->hw.image) if (vk->hw.image)
{ {
RARCH_ERR("[Vulkan]: HW image is not set. Buggy core?\n");
return false;
}
input.image = vk->hw.image->create_info.image; input.image = vk->hw.image->create_info.image;
input.view = vk->hw.image->image_view; input.view = vk->hw.image->image_view;
input.layout = vk->hw.image->image_layout; input.layout = vk->hw.image->image_layout;
@ -1756,6 +1760,25 @@ static bool vulkan_frame(void *data, const void *frame,
input.height = vk->hw.last_height; input.height = vk->hw.last_height;
} }
input.image = vk->hw.image->create_info.image;
input.view = vk->hw.image->image_view;
input.layout = vk->hw.image->image_layout;
/* The format can change on a whim. */
input.format = vk->hw.image->create_info.format;
}
else
{
/* Fall back to the default, black texture.
* This can happen if we restart the video driver while in the menu. */
input.image = vk->default_texture.image;
input.view = vk->default_texture.view;
input.layout = vk->default_texture.layout;
input.format = vk->default_texture.format;
input.width = vk->default_texture.width;
input.height = vk->default_texture.height;
}
vk->hw.last_width = input.width; vk->hw.last_width = input.width;
vk->hw.last_height = input.height; vk->hw.last_height = input.height;
} }