Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[host] dxgi: fix incorrect skip logic

Browse Source
This commit is contained in:
Geoffrey McRae 2022-05-18 15:59:31 +10:00
parent 57e20007db
commit 0f8c0b5fb3
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
host/platform/Windows/capture/DXGI/src/dxgi.c
View File

@ -298,8 +298,6 @@ static bool dxgi_init(void)
const char * optOutput = option_get_string("dxgi", "output" ); const char * optOutput = option_get_string("dxgi", "output" );
for (int i = 0; IDXGIFactory1_EnumAdapters1(this->factory, i, &this->adapter) != DXGI_ERROR_NOT_FOUND; ++i) for (int i = 0; IDXGIFactory1_EnumAdapters1(this->factory, i, &this->adapter) != DXGI_ERROR_NOT_FOUND; ++i)
{
if (optAdapter)
{ {
DXGI_ADAPTER_DESC1 adapterDesc; DXGI_ADAPTER_DESC1 adapterDesc;
status = IDXGIAdapter1_GetDesc1(this->adapter, &adapterDesc); status = IDXGIAdapter1_GetDesc1(this->adapter, &adapterDesc);
@ -320,9 +318,14 @@ static bool dxgi_init(void)
{ {
DEBUG_INFO("Not using unsupported adapter: %ls", DEBUG_INFO("Not using unsupported adapter: %ls",
adapterDesc.Description); adapterDesc.Description);
goto next_adapter;
IDXGIAdapter1_Release(this->adapter);
this->adapter = NULL;
continue;
} }
if (optAdapter)
{
const size_t s = (wcslen(adapterDesc.Description)+1) * 2; const size_t s = (wcslen(adapterDesc.Description)+1) * 2;
char * desc = malloc(s); char * desc = malloc(s);
wcstombs(desc, adapterDesc.Description, s); wcstombs(desc, adapterDesc.Description, s);
@ -331,16 +334,14 @@ static bool dxgi_init(void)
{ {
DEBUG_INFO("Not using adapter: %ls", adapterDesc.Description); DEBUG_INFO("Not using adapter: %ls", adapterDesc.Description);
free(desc); free(desc);
goto next_adapter;
IDXGIAdapter1_Release(this->adapter);
this->adapter = NULL;
continue;
} }
free(desc); free(desc);
DEBUG_INFO("Adapter matched, trying: %ls", adapterDesc.Description); DEBUG_INFO("Adapter matched, trying: %ls", adapterDesc.Description);
break;
next_adapter:
IDXGIAdapter1_Release(this->adapter);
this->adapter = NULL;
} }
for (int n = 0; IDXGIAdapter1_EnumOutputs(this->adapter, n, &this->output) != DXGI_ERROR_NOT_FOUND; ++n) for (int n = 0; IDXGIAdapter1_EnumOutputs(this->adapter, n, &this->output) != DXGI_ERROR_NOT_FOUND; ++n)