Incorporating PR refinement requests so REG_MULTI_SZ is handled in the HKR codepath...

diff --git a/loader/windows/OpenCL.rc b/loader/windows/OpenCL.rc
index cd6217a9c57b62e80c5896e6b105167ea3f9f8b5..db25dfecbcc854548dbe0463e935980216a3b9f4 100644 (file)
--- a/loader/windows/OpenCL.rc
+++ b/loader/windows/OpenCL.rc
@@ -20,7 +20,7 @@
 
 #define OPENCL_ICD_LOADER_VERSION_MAJOR 2
 #define OPENCL_ICD_LOADER_VERSION_MINOR 2
-#define OPENCL_ICD_LOADER_VERSION_REV   5
+#define OPENCL_ICD_LOADER_VERSION_REV   6
 
 #ifdef RC_INVOKED
 

diff --git a/loader/windows/icd_windows_dxgk.c b/loader/windows/icd_windows_dxgk.c
index 8844378a9fb0e520c0a4a3ee55f1f367035c4382..8639617bda91401ff65d1d4eb0b05f39efc83fea 100644 (file)
--- a/loader/windows/icd_windows_dxgk.c
+++ b/loader/windows/icd_windows_dxgk.c
@@ -121,7 +121,11 @@ bool khrIcdOsVendorsEnumerateDXGK(void)
                 // Try a different value type.  Some vendors write the key as a multi-string type.
                 queryArgs.ValueType = REG_MULTI_SZ;
                 Status = D3DKMTQueryAdapterInfo(&queryAdapterInfo);
-                if (!NT_SUCCESS(Status))
+                if (NT_SUCCESS(Status))
+                {
+                   KHR_ICD_TRACE("Accepting multi-string registry key type\n");
+                }
+                else
                 {
                    // Continue trying to get as much info on each adapter as possible.
                    // It's too late to return FALSE and claim WDDM2_4 enumeration is not available here.

diff --git a/loader/windows/icd_windows_hkr.c b/loader/windows/icd_windows_hkr.c
index a323312a8b96233b6638243ca83e264b4a1d7a94..aa55939583f8f66336558e41c8716321fac78db8 100644 (file)
--- a/loader/windows/icd_windows_hkr.c
+++ b/loader/windows/icd_windows_hkr.c
@@ -131,8 +131,15 @@ static bool ReadOpenCLKey(DEVINST dnDevNode)
 
         if (REG_SZ != dwLibraryNameType)
         {
-            KHR_ICD_TRACE("Unexpected registry entry 0x%x! continuing\n", dwLibraryNameType);
-            goto out;
+            if (REG_MULTI_SZ == dwLibraryNameType)
+            {
+               KHR_ICD_TRACE("Accepting multi-string registry key type\n");
+            }
+            else
+            {
+               KHR_ICD_TRACE("Unexpected registry entry 0x%x! continuing\n", dwLibraryNameType);
+               goto out;
+            }
         }
 
         KHR_ICD_TRACE("    Path: %s\n", cszOclPath);