OpenCL ICD Loader Deinitialization Support

CL/cl_ext.h

@@ -881,7 +881,7 @@ clLogMessagesToStderrAPPLE(
     "cl_khr_icd"
 
 
-#define CL_KHR_ICD_EXTENSION_VERSION CL_MAKE_VERSION(2, 0, 0)
+#define CL_KHR_ICD_EXTENSION_VERSION CL_MAKE_VERSION(2, 0, 1)
 
 /* cl_platform_info */
 #define CL_PLATFORM_ICD_SUFFIX_KHR                          0x0920
@@ -942,6 +942,19 @@ clIcdSetPlatformDispatchDataKHR(
 
 #endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
 
+/***************************************************************
+* cl_khr_icd_unloadable
+***************************************************************/
+#define cl_khr_icd_unloadable 1
+#define CL_KHR_ICD_UNLOADABLE_EXTENSION_NAME \
+    "cl_khr_icd_unloadable"
+
+
+#define CL_KHR_ICD_UNLOADABLE_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/* cl_platform_info */
+#define CL_PLATFORM_UNLOADABLE_KHR                          0x0921
+
 /***************************************************************
 * cl_khr_il_program
 ***************************************************************/

CL/cl_layer.h

@@ -54,17 +54,19 @@ extern "C" {
     "cl_loader_layers"
 
 
-#define CL_LOADER_LAYERS_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+#define CL_LOADER_LAYERS_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 1)
 
 typedef cl_uint             cl_layer_info;
 typedef cl_uint             cl_layer_api_version;
+typedef cl_properties       cl_layer_properties;
 
 /* cl_layer_info */
 #define CL_LAYER_API_VERSION                                0x4240
 #define CL_LAYER_NAME                                       0x4241
 
 /* Misc API enums */
 #define CL_LAYER_API_VERSION_100                            100
+#define CL_LAYER_PROPERTIES_LIST_END                        ((cl_layer_properties)0)
 
 
 typedef cl_int CL_API_CALL
@@ -87,6 +89,24 @@ clInitLayer_t(
 typedef clInitLayer_t *
 clInitLayer_fn ;
 
+typedef cl_int CL_API_CALL
+clInitLayerWithProperties_t(
+    cl_uint num_entries,
+    const cl_icd_dispatch* target_dispatch,
+    cl_uint* num_entries_ret,
+    const cl_icd_dispatch** layer_dispatch_ret,
+    const cl_layer_properties* properties);
+
+typedef clInitLayerWithProperties_t *
+clInitLayerWithProperties_fn ;
+
+typedef cl_int CL_API_CALL
+clDeinitLayer_t(
+    void );
+
+typedef clDeinitLayer_t *
+clDeinitLayer_fn ;
+
 /*
 ** The function pointer typedefs prefixed with "pfn_" are provided for
 ** compatibility with earlier versions of the headers.  New code is
@@ -100,6 +120,12 @@ pfn_clGetLayerInfo ;
 typedef clInitLayer_t *
 pfn_clInitLayer ;
 
+typedef clInitLayerWithProperties_t *
+pfn_clInitLayerWithProperties ;
+
+typedef clDeinitLayer_t *
+pfn_clDeinitLayer ;
+
 #if !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES)
 
 extern CL_API_ENTRY cl_int CL_API_CALL
@@ -116,6 +142,18 @@ clInitLayer(
     cl_uint* num_entries_ret,
     const cl_icd_dispatch** layer_dispatch_ret) ;
 
+extern CL_API_ENTRY cl_int CL_API_CALL
+clInitLayerWithProperties(
+    cl_uint num_entries,
+    const cl_icd_dispatch* target_dispatch,
+    cl_uint* num_entries_ret,
+    const cl_icd_dispatch** layer_dispatch_ret,
+    const cl_layer_properties* properties) ;
+
+extern CL_API_ENTRY cl_int CL_API_CALL
+clDeinitLayer(
+    void ) ;
+
 #endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
 
 #ifdef __cplusplus

scripts/cl_ext.h.mako

@@ -58,6 +58,7 @@ orderedExtensions = [
     'cl_APPLE_SetMemObjectDestructor',
     'cl_APPLE_ContextLoggingFunctions',
     'cl_khr_icd',
+    'cl_khr_icd_unloadable',
     'cl_khr_il_program',
     'cl_khr_image2D_from_buffer',   # incorrect name
     'cl_khr_image2d_from_buffer',