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

win-capture: Restore GL capture deduplication

Browse Source 
Previous fix attempted to place swap_recurse count in gl_data struct,
where it could be unexpectedly memset to 0. Separate member from struct,
and make thread-local for additional safety.
This commit is contained in:
jpark37
2021-03-30 18:23:51 -07:00
committed by Jim
parent fa8f95018d
commit 2472529520
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/win-capture/graphics-hook/gl-capture.c
View File

@@ -71,6 +71,7 @@ struct gl_data {
static HMODULE gl = NULL;
static bool nv_capture_available = false;
static struct gl_data data = {0};
__declspec(thread) static int swap_recurse;
static inline bool gl_error(const char *func, const char *str)
{
@@ -759,20 +760,36 @@ static void gl_capture(HDC hdc)
}
}
static inline void gl_swap_begin(HDC hdc)
{
const bool first = swap_recurse == 0;
++swap_recurse;
if (first && !global_hook_info->capture_overlay)
gl_capture(hdc);
}
static inline void gl_swap_end(HDC hdc)
{
--swap_recurse;
const bool first = swap_recurse == 0;
if (first && global_hook_info->capture_overlay)
gl_capture(hdc);
}
static BOOL WINAPI hook_swap_buffers(HDC hdc)
{
BOOL ret;
if (!global_hook_info->capture_overlay)
gl_capture(hdc);
gl_swap_begin(hdc);
unhook(&swap_buffers);
BOOL(WINAPI * call)(HDC) = swap_buffers.call_addr;
ret = call(hdc);
rehook(&swap_buffers);
if (global_hook_info->capture_overlay)
gl_capture(hdc);
gl_swap_end(hdc);
return ret;
}
@@ -781,16 +798,14 @@ static BOOL WINAPI hook_wgl_swap_buffers(HDC hdc)
{
BOOL ret;
if (!global_hook_info->capture_overlay)
gl_capture(hdc);
gl_swap_begin(hdc);
unhook(&wgl_swap_buffers);
BOOL(WINAPI * call)(HDC) = wgl_swap_buffers.call_addr;
ret = call(hdc);
rehook(&wgl_swap_buffers);
if (global_hook_info->capture_overlay)
gl_capture(hdc);
gl_swap_end(hdc);
return ret;
}
@@ -799,16 +814,14 @@ static BOOL WINAPI hook_wgl_swap_layer_buffers(HDC hdc, UINT planes)
{
BOOL ret;
if (!global_hook_info->capture_overlay)
gl_capture(hdc);
gl_swap_begin(hdc);
unhook(&wgl_swap_layer_buffers);
BOOL(WINAPI * call)(HDC, UINT) = wgl_swap_layer_buffers.call_addr;
ret = call(hdc, planes);
rehook(&wgl_swap_layer_buffers);
if (global_hook_info->capture_overlay)
gl_capture(hdc);
gl_swap_end(hdc);
return ret;
}