[PATCH 2/4] rename opencl_image_type_to_index() to pocl_opencl_image_type_to_index()

Gbp-Pq: Name 0002-rename-opencl_image_type_to_index-to-pocl_opencl_ima.patch

diff --git a/lib/CL/clCreateImage.c b/lib/CL/clCreateImage.c
index f32ec2b964df51cc8387abaac11ed6934e55ca2c..f6266f954980204576669d82db3cc75c3fc55df0 100644 (file)
--- a/lib/CL/clCreateImage.c
+++ b/lib/CL/clCreateImage.c
@@ -64,7 +64,7 @@ pocl_create_image_internal (cl_context context, cl_mem_flags flags,
         " || image_desc->num_samples != 0 ");
 
     image_type = image_desc->image_type;
-    image_type_idx = opencl_image_type_to_index (image_type);
+    image_type_idx = pocl_opencl_image_type_to_index (image_type);
     POCL_GOTO_ERROR_ON ((image_type_idx < 0),
                         CL_INVALID_VALUE, "unknown image type\n");
 

diff --git a/lib/CL/clGetSupportedImageFormats.c b/lib/CL/clGetSupportedImageFormats.c
index 6bd511f03d34b1db087e66374549c7bfbf909551..4bfbcd44c739e9e836727f2eb6076877e787b7cf 100644 (file)
--- a/lib/CL/clGetSupportedImageFormats.c
+++ b/lib/CL/clGetSupportedImageFormats.c
@@ -39,7 +39,7 @@ CL_API_SUFFIX__VERSION_1_0
   
   POCL_RETURN_ERROR_COND((num_entries == 0 && image_formats != NULL), CL_INVALID_VALUE);
 
-  cl_int idx = opencl_image_type_to_index (image_type);
+  cl_int idx = pocl_opencl_image_type_to_index (image_type);
 
   POCL_RETURN_ERROR_ON ((idx < 0), CL_INVALID_VALUE,
                         "invalid image type\n");

diff --git a/lib/CL/devices/proxy/pocl_proxy.c b/lib/CL/devices/proxy/pocl_proxy.c
index c9d7411806e003d8a982b35687f84b01d5ad74ac..6551fefac604e163d3788fee03ef5365afcde60a 100644 (file)
--- a/lib/CL/devices/proxy/pocl_proxy.c
+++ b/lib/CL/devices/proxy/pocl_proxy.c
@@ -598,7 +598,7 @@ pocl_proxy_get_device_info (cl_device_id device, proxy_device_data_t *d)
       assert (err == CL_SUCCESS);
       assert (retval == num_image_formats);
 
-      int type_index = opencl_image_type_to_index (type);
+      int type_index = pocl_opencl_image_type_to_index (type);
       device->image_formats[type_index] = formats;
       device->num_image_formats[type_index] = num_image_formats;
     }

diff --git a/lib/CL/pocl_image_util.c b/lib/CL/pocl_image_util.c
index cd6b05cd85d6568cf5c7514b0b4c360a7e7e378a..d3c83e9d5c5fef0d114174a383bf046a137b5616 100644 (file)
--- a/lib/CL/pocl_image_util.c
+++ b/lib/CL/pocl_image_util.c
@@ -26,7 +26,7 @@
 #include "pocl_cl.h"
 #include "pocl_util.h"
 
-cl_int opencl_image_type_to_index (cl_mem_object_type  image_type)
+cl_int pocl_opencl_image_type_to_index (cl_mem_object_type  image_type)
 {
   switch (image_type)
     {

diff --git a/lib/CL/pocl_image_util.h b/lib/CL/pocl_image_util.h
index 1d9d36e79ca3b559b37ec0d51b632ff78cfa1c7e..046365e154157d476c0430d090eb7ac6ead0c532 100644 (file)
--- a/lib/CL/pocl_image_util.h
+++ b/lib/CL/pocl_image_util.h
@@ -33,7 +33,7 @@
 void origin_to_bytes (cl_mem mem, const size_t *origin, size_t *byte_offset);
 
 POCL_EXPORT
-cl_int opencl_image_type_to_index (cl_mem_object_type  image_type);
+cl_int pocl_opencl_image_type_to_index (cl_mem_object_type  image_type);
 
 extern cl_int 
 pocl_check_image_origin_region (const cl_mem image,