dynamically load functions for OpenCLon12 (#197)

* try without including AppModel.h

* dynamically load the OpenCLOn12 functions

* update README

Author: bashbaug

CMakeLists.txt

@@ -117,8 +117,6 @@ set_target_properties (OpenCL PROPERTIES VERSION "1.2" SOVERSION "1")
 if (WIN32)
     target_link_libraries (OpenCL PRIVATE cfgmgr32.lib runtimeobject.lib)
 
-    option (OPENCL_ICD_LOADER_DISABLE_OPENCLON12 "Disable support for OpenCLOn12. Support for OpenCLOn12 should only be disabled when building an import lib to link with, and must be enabled when building an ICD loader for distribution!" OFF)
-
     # Generate a DLL without a "lib" prefix for mingw.
     if (MINGW OR MSYS OR CYGWIN)
         set_target_properties(OpenCL PROPERTIES PREFIX "")
@@ -151,7 +149,6 @@ target_compile_definitions (OpenCL
   PRIVATE
     CL_TARGET_OPENCL_VERSION=300
     $<$<BOOL:${ENABLE_OPENCL_LAYERS}>:CL_ENABLE_LAYERS>
-    $<$<BOOL:${OPENCL_ICD_LOADER_DISABLE_OPENCLON12}>:OPENCL_ICD_LOADER_DISABLE_OPENCLON12>
 )
 
 target_include_directories (OpenCL

README.md

@@ -35,9 +35,6 @@ The OpenCL ICD Loader requires:
   - It is recommended to install the headers via CMake, however a convenience shorthand is provided. Providing `OPENCL_ICD_LOADER_HEADERS_DIR` to CMake, one may specify the location of OpenCL Headers. By default, the OpenCL ICD Loader will look for OpenCL Headers in the inc directory.
 - The OpenCL ICD Loader uses CMake for its build system.
 If CMake is not provided by your build system or OS package manager, please consult the [CMake website](https://cmake.org).
-- The Windows OpenCL ICD Loader requires the Windows SDK to check for and enumerate the OpenCLOn12 ICD.
-An OpenCL ICD Loader can be built without a dependency on the Windows SDK using the CMake variable `OPENCL_ICD_LOADER_DISABLE_OPENCLON12`.
-This variable should only be used when building an import lib to link with, and must be enabled when building an OpenCL ICD Loader for distribution!
 
 ### Example Build
 

loader/windows/icd_windows_apppackage.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Khronos Group Inc.
+ * Copyright (c) 2017-2022 The Khronos Group Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,53 +19,78 @@
 #include <icd.h>
 #include "icd_windows_apppackage.h"
 
-#ifdef OPENCL_ICD_LOADER_DISABLE_OPENCLON12
+typedef _Check_return_ LONG(WINAPI *PFN_GetPackagesByPackageFamily)(
+    _In_ PCWSTR packageFamilyName,
+    _Inout_ UINT32* count,
+    _Out_writes_opt_(*count) PWSTR* packageFullNames,
+    _Inout_ UINT32* bufferLength,
+    _Out_writes_opt_(*bufferLength) WCHAR* buffer
+    );
+
+typedef LONG (WINAPI *PFN_GetPackagePathByFullName)(
+    _In_ PCWSTR packageFullName,
+    _Inout_ UINT32* pathLength,
+    _Out_writes_opt_(*pathLength) PWSTR path
+    );
 
 bool khrIcdOsVendorsEnumerateAppPackage(void)
 {
-    KHR_ICD_TRACE("OpenCLOn12 is disabled\n");
-    return false;
-}
+    bool ret = false;
+    WCHAR *buffer = NULL;
+    PWSTR *packages = NULL;
 
-#else
+    HMODULE h = LoadLibrary("kernel32.dll");
+    if (h == NULL)
+        return ret;
 
-#include <AppModel.h>
+    PFN_GetPackagesByPackageFamily pGetPackagesByPackageFamily =
+        (PFN_GetPackagesByPackageFamily)GetProcAddress(h, "GetPackagesByPackageFamily");
+    if (!pGetPackagesByPackageFamily)
+    {
+        KHR_ICD_TRACE("GetProcAddress failed for GetPackagesByPackageFamily\n");
+        goto cleanup;
+    }
+
+    PFN_GetPackagePathByFullName pGetPackagePathByFullName =
+        (PFN_GetPackagePathByFullName)GetProcAddress(h, "GetPackagePathByFullName");
+    if (!pGetPackagePathByFullName)
+    {
+        KHR_ICD_TRACE("GetProcAddress failed for GetPackagePathByFullName\n");
+        goto cleanup;
+    }
 
-bool khrIcdOsVendorsEnumerateAppPackage(void)
-{
     UINT32 numPackages = 0, bufferLength = 0;
     PCWSTR familyName = L"Microsoft.D3DMappingLayers_8wekyb3d8bbwe";
-    if (ERROR_INSUFFICIENT_BUFFER != GetPackagesByPackageFamily(familyName,
-                                                                &numPackages, NULL,
-                                                                &bufferLength, NULL) ||
+    if (ERROR_INSUFFICIENT_BUFFER != pGetPackagesByPackageFamily(familyName,
+                                                                 &numPackages, NULL,
+                                                                 &bufferLength, NULL) ||
         numPackages == 0 || bufferLength == 0)
     {
         KHR_ICD_TRACE("Failed to find mapping layers packages by family name\n");
-        return false;
+        goto cleanup;
     }
 
-    bool ret = false;
-    WCHAR *buffer = malloc(sizeof(WCHAR) * bufferLength);
-    PWSTR *packages = malloc(sizeof(PWSTR) * numPackages);
+    buffer = malloc(sizeof(WCHAR) * bufferLength);
+    packages = malloc(sizeof(PWSTR) * numPackages);
     if (!buffer || !packages)
     {
         KHR_ICD_TRACE("Failed to allocate memory for package names\n");
         goto cleanup;
     }
 
-    if (ERROR_SUCCESS != GetPackagesByPackageFamily(familyName,
-                                                    &numPackages, packages,
-                                                    &bufferLength, buffer))
+    if (ERROR_SUCCESS != pGetPackagesByPackageFamily(familyName,
+                                                     &numPackages, packages,
+                                                     &bufferLength, buffer))
     {
         KHR_ICD_TRACE("Failed to get mapping layers package full names\n");
         goto cleanup;
     }
 
     UINT32 pathLength = 0;
     WCHAR path[MAX_PATH];
-    if (ERROR_INSUFFICIENT_BUFFER != GetPackagePathByFullName(packages[0], &pathLength, NULL) ||
+    if (ERROR_INSUFFICIENT_BUFFER != pGetPackagePathByFullName(packages[0], &pathLength, NULL) ||
         pathLength > MAX_PATH ||
-        ERROR_SUCCESS != GetPackagePathByFullName(packages[0], &pathLength, path))
+        ERROR_SUCCESS != pGetPackagePathByFullName(packages[0], &pathLength, path))
     {
         KHR_ICD_TRACE("Failed to get mapping layers package path length\n");
         goto cleanup;
@@ -91,9 +116,8 @@ bool khrIcdOsVendorsEnumerateAppPackage(void)
     ret = adapterAdd(narrowDllPath, ZeroLuid);
 
 cleanup:
+    FreeLibrary(h);
     free(buffer);
     free(packages);
     return ret;
 }
-
-#endif