jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3260 from jpark37/vulkan-cts-hack-remove

Browse Source 
win-capture: Remove Vulkan CTS workaround
This commit is contained in:
Jim 2020-08-27 10:18:08 -07:00 committed by GitHub
commit 6efd70fc01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/win-capture/graphics-hook/vulkan-capture.c
View File

@ -449,13 +449,6 @@ static void vk_shtex_free(struct vk_data *data)
/* ------------------------------------------------------------------------- */
/* https://github.com/KhronosGroup/VK-GL-CTS/issues/218 */
#define CTS_WORKAROUND
#ifdef CTS_WORKAROUND
static struct vk_obj_list surfaces;
#endif
static void add_surf_data(struct vk_inst_data *data, VkSurfaceKHR surf,
HWND hwnd, const VkAllocationCallbacks *ac)
{
@ -465,39 +458,22 @@ static void add_surf_data(struct vk_inst_data *data, VkSurfaceKHR surf,
if (surf_data) {
surf_data->hwnd = hwnd;
#ifdef CTS_WORKAROUND
(void)data;
add_obj_data(&surfaces, (uint64_t)surf, surf_data);
#else
add_obj_data(&data->surfaces, (uint64_t)surf, surf_data);
#endif
}
}
static HWND find_surf_hwnd(struct vk_inst_data *data, VkSurfaceKHR surf)
{
#ifdef CTS_WORKAROUND
(void)data;
struct vk_surf_data *surf_data =
(struct vk_surf_data *)get_obj_data(&surfaces, (uint64_t)surf);
#else
struct vk_surf_data *surf_data = (struct vk_surf_data *)get_obj_data(
&data->surfaces, (uint64_t)surf);
#endif
return surf_data->hwnd;
}
static void remove_free_surf_data(struct vk_inst_data *data, VkSurfaceKHR surf,
const VkAllocationCallbacks *ac)
{
#ifdef CTS_WORKAROUND
(void)data;
struct vk_surf_data *surf_data = (struct vk_surf_data *)remove_obj_data(
&surfaces, (uint64_t)surf);
#else
struct vk_surf_data *surf_data = (struct vk_surf_data *)remove_obj_data(
&data->surfaces, (uint64_t)surf);
#endif
vk_free(ac, surf_data);
}
@ -1832,9 +1808,6 @@ __declspec(dllexport) VkResult VKAPI_CALL
if (!vulkan_seen) {
init_obj_list(&instances);
init_obj_list(&devices);
#ifdef CTS_WORKAROUND
init_obj_list(&surfaces);
#endif
vulkan_seen = true;
}