1 files changed, 33 insertions, 11 deletions

diff --git a/libhb/vce_common.c b/libhb/vce_common.c
index 632bf9757..8223e5671 100644
--- a/libhb/vce_common.c
+++ b/libhb/vce_common.c
@@ -17,30 +17,32 @@
 
 AMF_RESULT check_component_available(const wchar_t *componentID)
 {
-    amf_handle          library = NULL;
-    AMFInit_Fn          init_fun;
+    amf_handle          libHandle = NULL;
+    AMFInit_Fn          initFun;
     AMFFactory         *factory = NULL;
     AMFContext         *context = NULL;
+    AMFContext1        *context1 = NULL;
     AMFComponent       *encoder = NULL;
     AMFCaps            *encoderCaps = NULL;
     AMF_RESULT          result = AMF_FAIL;
 
-    library = hb_dlopen(AMF_DLL_NAMEA);
-    if(!library)
+    libHandle = hb_dlopen(AMF_DLL_NAMEA);
+
+    if(!libHandle)
     {
         result =  AMF_FAIL;
         goto clean;
     }
 
-    init_fun = (AMFInit_Fn)(hb_dlsym(library, AMF_INIT_FUNCTION_NAME));
-    if(!init_fun)
+    initFun = (AMFInit_Fn)(hb_dlsym(libHandle, AMF_INIT_FUNCTION_NAME));
+    if(!initFun)
     {
         result = AMF_FAIL;
         hb_error("VCE: Load Library Failed");
         goto clean;
     }
 
-    result = init_fun(AMF_FULL_VERSION, &factory);
+    result = initFun(AMF_FULL_VERSION, &factory);
     if(result != AMF_OK)
     {
         hb_error("VCE: Init Failed");
@@ -58,12 +60,26 @@ AMF_RESULT check_component_available(const wchar_t *componentID)
     if (result != AMF_OK) {
         result = context->pVtbl->InitDX9(context, NULL);
         if (result != AMF_OK) {
-            hb_error("VCE: DX11 and DX9 Failed");
-            goto clean;
+            AMFGuid guid = IID_AMFContext1();
+            result = context->pVtbl->QueryInterface(context, &guid, (void**)&context1);
+            if (result != AMF_OK) {
+                hb_error("VCE: CreateContext1() failed");
+                goto clean;
+            }
+
+            result = context1->pVtbl->InitVulkan(context1, NULL);
+            if (result != AMF_OK) {
+                if (result == AMF_NOT_SUPPORTED)
+                    hb_error("VCE: AMF via Vulkan is not supported on the given device.\n");
+                else
+                    hb_error("VCE: AMF failed to initialise on the given Vulkan device.\n");
+                goto clean;
+            }
         }
     }
 
     result = factory->pVtbl->CreateComponent(factory, context, componentID, &encoder);
+
     if(result != AMF_OK)
     {
         goto clean;
@@ -90,9 +106,15 @@ clean:
         context->pVtbl->Release(context);
         context = NULL;
     }
-    if(library)
+    if (context1)
+    {
+        context1->pVtbl->Terminate(context1);
+        context1->pVtbl->Release(context1);
+        context1 = NULL;
+    }
+    if(libHandle)
     {
-        hb_dlclose(library);
+        hb_dlclose(libHandle);
     }
 
     return result;