opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-30 17:58:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

graphics-hook: Fix crash with Vulkan DirectDisplay

Browse Source 
Vulkan Direct Display uses extensions:
VK_KHR_display/VK_EXT_direct_mode_display
This workflow allows creating swapchains that arn't active on the
desktop, so they don't have HWNDs.
Avoid trying to create swap_data when a HWND can't be found.

Fixes #11581
This commit is contained in:
Malcolm Bechard
2024-12-02 18:33:02 -05:00
committed by Ryan Foster
parent 9b0ac7c01c
commit 343ae6015a
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/win-capture/graphics-hook/vulkan-capture.c
+24 -19
View File
@@ -509,7 +509,9 @@ static void add_surf_data(struct vk_inst_data *idata, VkSurfaceKHR surf, HWND hw
static HWND find_surf_hwnd(struct vk_inst_data *idata, VkSurfaceKHR surf)
{
struct vk_surf_data *surf_data = (struct vk_surf_data *)get_obj_data(&idata->surfaces, (uint64_t)surf);
return surf_data->hwnd;
if (surf_data)
return surf_data->hwnd;
return 0;
}
static void remove_free_surf_data(struct vk_inst_data *idata, VkSurfaceKHR surf, const VkAllocationCallbacks *ac)
@@ -1641,25 +1643,28 @@ static VkResult VKAPI_CALL OBS_CreateSwapchainKHR(VkDevice device, const VkSwapc
res = funcs->GetSwapchainImagesKHR(device, sc, &count, NULL);
debug_res("GetSwapchainImagesKHR", res);
if ((res == VK_SUCCESS) && (count > 0)) {
struct vk_swap_data *swap_data = alloc_swap_data(ac);
if (swap_data) {
swap_data->swap_images = vk_alloc(ac, count * sizeof(VkImage), _Alignof(VkImage),
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
res = funcs->GetSwapchainImagesKHR(device, sc, &count, swap_data->swap_images);
debug_res("GetSwapchainImagesKHR", res);
HWND hwnd = find_surf_hwnd(data->inst_data, cinfo->surface);
if (hwnd) {
struct vk_swap_data *swap_data = alloc_swap_data(ac);
if (swap_data) {
swap_data->swap_images = vk_alloc(ac, count * sizeof(VkImage), _Alignof(VkImage),
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
res = funcs->GetSwapchainImagesKHR(device, sc, &count, swap_data->swap_images);
debug_res("GetSwapchainImagesKHR", res);
swap_data->image_extent = cinfo->imageExtent;
swap_data->format = cinfo->imageFormat;
swap_data->hwnd = find_surf_hwnd(data->inst_data, cinfo->surface);
swap_data->export_image = VK_NULL_HANDLE;
swap_data->layout_initialized = false;
swap_data->export_mem = VK_NULL_HANDLE;
swap_data->image_count = count;
swap_data->handle = INVALID_HANDLE_VALUE;
swap_data->shtex_info = NULL;
swap_data->d3d11_tex = NULL;
swap_data->captured = false;
init_swap_data(swap_data, data, sc);
swap_data->image_extent = cinfo->imageExtent;
swap_data->format = cinfo->imageFormat;
swap_data->hwnd = hwnd;
swap_data->export_image = VK_NULL_HANDLE;
swap_data->layout_initialized = false;
swap_data->export_mem = VK_NULL_HANDLE;
swap_data->image_count = count;
swap_data->handle = INVALID_HANDLE_VALUE;
swap_data->shtex_info = NULL;
swap_data->d3d11_tex = NULL;
swap_data->captured = false;
init_swap_data(swap_data, data, sc);
}
}
}