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

win-capture: Determine D3D11 usage once per run

Browse Source 
The device type (OBS renderer) cannot change without restarting OBS, so
we should only have to check if we're using D3D11 once instead of
checking every time a new display capture or window capture source is
created.
This commit is contained in:
Ryan Foster 2021-06-07 08:00:29 -04:00 committed by Jim
parent 1fa45e63a3
commit 2f3c0911fa
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/win-capture/duplicator-monitor-capture.c
View File

@ -306,6 +306,8 @@ static bool load_winrt_imports(struct winrt_exports *exports, void *module,
return success;
}
extern bool graphics_uses_d3d11;
static void *duplicator_capture_create(obs_data_t *settings,
obs_source_t *source)
{
@ -316,11 +318,7 @@ static void *duplicator_capture_create(obs_data_t *settings,
pthread_mutex_init(&capture->update_mutex, NULL);
obs_enter_graphics();
const bool uses_d3d11 = gs_get_device_type() == GS_DEVICE_DIRECT3D_11;
obs_leave_graphics();
if (uses_d3d11) {
if (graphics_uses_d3d11) {
static const char *const module = "libobs-winrt";
capture->winrt_module = os_dlopen(module);
if (capture->winrt_module &&

8
plugins/win-capture/plugin-main.c
View File

@ -68,6 +68,8 @@ void wait_for_hook_initialization(void)
void init_hook_files(void);
bool graphics_uses_d3d11 = false;
bool obs_module_load(void)
{
struct win_version_info ver;
@ -85,14 +87,14 @@ bool obs_module_load(void)
win8_or_above = ver.major > 6 || (ver.major == 6 && ver.minor >= 2);
obs_enter_graphics();
graphics_uses_d3d11 = gs_get_device_type() == GS_DEVICE_DIRECT3D_11;
obs_leave_graphics();
if (win8_or_above && gs_get_device_type() == GS_DEVICE_DIRECT3D_11)
if (win8_or_above && graphics_uses_d3d11)
obs_register_source(&duplicator_capture_info);
else
obs_register_source(&monitor_capture_info);
obs_leave_graphics();
obs_register_source(&window_capture_info);
char *config_path = obs_module_config_path(NULL);

8
plugins/win-capture/window-capture.c
View File

@ -236,6 +236,8 @@ static bool load_winrt_imports(struct winrt_exports *exports, void *module,
return success;
}
extern bool graphics_uses_d3d11;
static void *wc_create(obs_data_t *settings, obs_source_t *source)
{
struct window_capture *wc = bzalloc(sizeof(struct window_capture));
@ -243,11 +245,7 @@ static void *wc_create(obs_data_t *settings, obs_source_t *source)
pthread_mutex_init(&wc->update_mutex, NULL);
obs_enter_graphics();
const bool uses_d3d11 = gs_get_device_type() == GS_DEVICE_DIRECT3D_11;
obs_leave_graphics();
if (uses_d3d11) {
if (graphics_uses_d3d11) {
static const char *const module = "libobs-winrt";
wc->winrt_module = os_dlopen(module);
if (wc->winrt_module &&