Replace cl prefix with clIcd prefix for new entry points.

OCL-dev · Nov 28, 2023 · 6d64fa3 · 6d64fa3
1 parent 7b8d68c
commit 6d64fa3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/icd_generator.rb b/icd_generator.rb
@@ -899,7 +899,7 @@ def self.generate_ocl_icd_loader_gen_source
 
 void _populate_dispatch_table(
     cl_platform_id pid,
-    clGetFunctionAddressForPlatformKHR_fn pltfn_fn_ptr,
+    clIcdGetFunctionAddressForPlatformKHR_fn pltfn_fn_ptr,
     struct _cl_icd_dispatch *dispatch) {
 EOF
     ($api_entries.length+$buff).times { |i|

diff --git a/ocl_icd_loader.c b/ocl_icd_loader.c
@@ -496,10 +496,10 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
       debug(D_WARN, "Not enough platform allocated. Skipping ICD");
       continue;
     }
-    clGetFunctionAddressForPlatformKHR_fn pltfn_fn_ptr =
-      _get_function_addr(dlh, picd->ext_fn_ptr, "clGetFunctionAddressForPlatformKHR");
-    clSetPlatformDispatchDataKHR_fn spltdd_fn_ptr =
-      _get_function_addr(dlh, picd->ext_fn_ptr, "clSetPlatformDispatchDataKHR");
+    clIcdGetFunctionAddressForPlatformKHR_fn pltfn_fn_ptr =
+      _get_function_addr(dlh, picd->ext_fn_ptr, "clIcdGetFunctionAddressForPlatformKHR");
+    clIcdSetPlatformDispatchDataKHR_fn spltdd_fn_ptr =
+      _get_function_addr(dlh, picd->ext_fn_ptr, "clIcdSetPlatformDispatchDataKHR");
 
     for(j=0; j<num_platforms; j++) {
       debug(D_LOG, "Checking platform %i", j);
@@ -510,12 +510,12 @@ static inline void _find_and_check_platforms(cl_uint num_icds) {
       p->pid=platforms[j];
 
       if (KHR_ICD2_HAS_TAG(p->pid) && !pltfn_fn_ptr) {
-        debug(D_WARN, "Found icd 2 platform, but it is missing clGetFunctionAddressForPlatformKHR, skipping it");
+        debug(D_WARN, "Found icd 2 platform, but it is missing clIcdGetFunctionAddressForPlatformKHR, skipping it");
         continue;
       }
 
       if (KHR_ICD2_HAS_TAG(p->pid) && !spltdd_fn_ptr) {
-        debug(D_WARN, "Found icd 2 platform, but it is missing clSetPlatformDispatchDataKHR, skipping it");
+        debug(D_WARN, "Found icd 2 platform, but it is missing clIcdSetPlatformDispatchDataKHR, skipping it");
         continue;
       }
 

diff --git a/ocl_icd_loader.h b/ocl_icd_loader.h
@@ -79,25 +79,25 @@ struct layer_icd {
 #define CL_ICD2_TAG_KHR ((size_t)0x4F50454E434C3331ULL)
 
 typedef void * CL_API_CALL
-clGetFunctionAddressForPlatformKHR_t(
+clIcdGetFunctionAddressForPlatformKHR_t(
     cl_platform_id platform,
     const char* function_name);
 
-typedef clGetFunctionAddressForPlatformKHR_t *
-clGetFunctionAddressForPlatformKHR_fn;
+typedef clIcdGetFunctionAddressForPlatformKHR_t *
+clIcdGetFunctionAddressForPlatformKHR_fn;
 
 typedef cl_int CL_API_CALL
-clSetPlatformDispatchDataKHR_t(
+clIcdSetPlatformDispatchDataKHR_t(
     cl_platform_id platform,
     void *disp_data);
 
-typedef clSetPlatformDispatchDataKHR_t *
-clSetPlatformDispatchDataKHR_fn;
+typedef clIcdSetPlatformDispatchDataKHR_t *
+clIcdSetPlatformDispatchDataKHR_fn;
 
 __attribute__((visibility("hidden")))
 extern void _populate_dispatch_table(
     cl_platform_id platform,
-    clGetFunctionAddressForPlatformKHR_fn pltfn_fn_ptr,
+    clIcdGetFunctionAddressForPlatformKHR_fn pltfn_fn_ptr,
     struct _cl_icd_dispatch* dispatch);
 #endif