@@ -39,16 +39,16 @@ const char VAAPI_DEFAULT_DRIVER_NAME[] = "vaon12";
3939typedef struct _VADisplayContextWin32 {
4040 LUID adapter_luid ;
4141 char registry_driver_name [MAX_PATH ];
42- uint8_t registry_driver_available_flag ;
42+ bool registry_driver_available_flag ;
4343} VADisplayContextWin32 ;
4444
45- static bool TryLoadDriverNameFromRegistry ( const LUID * adapter_luid , VADisplayContextWin32 * pWin32Ctx )
45+ static void LoadDriverNameFromRegistry ( VADisplayContextWin32 * pWin32Ctx )
4646{
4747 HMODULE hGdi32 = LoadLibraryA ("gdi32.dll" );
4848 if (!hGdi32 )
49- return false ;
49+ return ;
5050
51- D3DKMT_OPENADAPTERFROMLUID OpenArgs = { .AdapterLuid = * adapter_luid };
51+ D3DKMT_OPENADAPTERFROMLUID OpenArgs = { .AdapterLuid = pWin32Ctx -> adapter_luid };
5252 D3DDDI_QUERYREGISTRY_INFO RegistryInfo = {
5353 .QueryType = D3DDDI_QUERYREGISTRY_ADAPTERKEY ,
5454 .QueryFlags .TranslatePath = true,
@@ -66,7 +66,6 @@ static bool TryLoadDriverNameFromRegistry(const LUID* adapter_luid, VADisplayCon
6666 .pPrivateDriverData = & RegistryInfo ,
6767 .PrivateDriverDataSize = sizeof (RegistryInfo ),
6868 };
69- bool ret = false;
7069
7170 PFND3DKMT_OPENADAPTERFROMLUID pfnOpenAdapterFromLuid = (PFND3DKMT_OPENADAPTERFROMLUID )GetProcAddress (hGdi32 , "D3DKMTOpenAdapterFromLuid" );
7271 PFND3DKMT_CLOSEADAPTER pfnCloseAdapter = (PFND3DKMT_CLOSEADAPTER )GetProcAddress (hGdi32 , "D3DKMTCloseAdapter" );
@@ -101,7 +100,7 @@ static bool TryLoadDriverNameFromRegistry(const LUID* adapter_luid, VADisplayCon
101100 NULL , NULL ))
102101 goto cleanup ;
103102
104- ret = true;
103+ pWin32Ctx -> registry_driver_available_flag = true;
105104
106105cleanup :
107106 if (pRegistryInfo && pRegistryInfo != & RegistryInfo )
@@ -111,7 +110,6 @@ static bool TryLoadDriverNameFromRegistry(const LUID* adapter_luid, VADisplayCon
111110 pfnCloseAdapter (& Close );
112111 }
113112 FreeLibrary (hGdi32 );
114- return ret ;
115113}
116114
117115static int va_DisplayContextIsValid (
@@ -211,7 +209,7 @@ VADisplay vaGetDisplayWin32(
211209 memcpy (& pWin32Ctx -> adapter_luid , adapter_luid , sizeof (pWin32Ctx -> adapter_luid ));
212210
213211 /* Load the preferred driver name from the driver registry if available */
214- pWin32Ctx -> registry_driver_available_flag = TryLoadDriverNameFromRegistry ( & pWin32Ctx -> adapter_luid , pWin32Ctx ) ? 1 : 0 ;
212+ LoadDriverNameFromRegistry ( pWin32Ctx ) ;
215213 if (pWin32Ctx -> registry_driver_available_flag ) {
216214 fprintf (stderr , "VA_Win32: Found driver %s in the registry for LUID %ld %ld \n" , pWin32Ctx -> registry_driver_name , pWin32Ctx -> adapter_luid .LowPart , pWin32Ctx -> adapter_luid .HighPart );
217215 } else {
0 commit comments