[PATCH 04/10] rename fill_dev_*_t to pocl_fill_dev_*_t

Gbp-Pq: Name 0004-rename-fill_dev_-_t-to-pocl_fill_dev_-_t.patch

diff --git a/lib/CL/devices/basic/basic.c b/lib/CL/devices/basic/basic.c
index 99f8572d26c32c540a9806de124f699ddc3036ab..47b831fbf1dc0f4cf6680ae54314501bd842dbd3 100644 (file)
--- a/lib/CL/devices/basic/basic.c
+++ b/lib/CL/devices/basic/basic.c
@@ -375,7 +375,7 @@ pocl_basic_run (void *data, _cl_command_node *cmd)
       else if (meta->arg_info[i].type == POCL_ARG_TYPE_IMAGE)
         {
           dev_image_t di;
-          fill_dev_image_t (&di, al, cmd->device);
+          pocl_fill_dev_image_t (&di, al, cmd->device);
 
           void *devptr = pocl_aligned_malloc (MAX_EXTENDED_ALIGNMENT,
                                               sizeof (dev_image_t));
@@ -386,7 +386,7 @@ pocl_basic_run (void *data, _cl_command_node *cmd)
       else if (meta->arg_info[i].type == POCL_ARG_TYPE_SAMPLER)
         {
           dev_sampler_t ds;
-          fill_dev_sampler_t(&ds, al);
+          pocl_fill_dev_sampler_t (&ds, al);
           arguments[i] = malloc (sizeof (void *));
           *(void **)(arguments[i]) = (void *)ds;
         }

diff --git a/lib/CL/devices/common.c b/lib/CL/devices/common.c
index 274cacb1545bf2b92f3fe22564cdf7da2b9e7456..a62eca6676419b900d6622940538c58345df6ae8 100644 (file)
--- a/lib/CL/devices/common.c
+++ b/lib/CL/devices/common.c
@@ -261,8 +261,8 @@ FINISH:
  * from given kernel image argument
  */
 void
-fill_dev_image_t (dev_image_t* di, struct pocl_argument* parg,
-                  cl_device_id device)
+pocl_fill_dev_image_t (dev_image_t *di, struct pocl_argument *parg,
+                       cl_device_id device)
 {
   cl_mem mem = *(cl_mem *)parg->value;
   di->_width = mem->image_width;
@@ -791,7 +791,7 @@ pocl_broadcast (cl_event brc_event)
  * from given kernel sampler argument
  */
 void
-fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg)
+pocl_fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg)
 {
   cl_sampler sampler = *(cl_sampler *)parg->value;
 

diff --git a/lib/CL/devices/common.h b/lib/CL/devices/common.h
index e9a6bca990bed51c794afea4c3f1d204cfc585d8..239e69c4e9a6ae7a307dd8a4bbf7c85cc5714705 100644 (file)
--- a/lib/CL/devices/common.h
+++ b/lib/CL/devices/common.h
@@ -64,10 +64,10 @@ int llvm_codegen (char *output, unsigned device_i, cl_kernel kernel,
                   cl_device_id device, _cl_command_node *command,
                   int specialize);
 
-void fill_dev_image_t (dev_image_t *di, struct pocl_argument *parg,
-                       cl_device_id device);
+void pocl_fill_dev_image_t (dev_image_t *di, struct pocl_argument *parg,
+                            cl_device_id device);
 
-void fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg);
+void pocl_fill_dev_sampler_t (dev_sampler_t *ds, struct pocl_argument *parg);
 
 void pocl_copy_mem_object (cl_device_id dest_dev, cl_mem dest,
                            size_t dest_offset,

diff --git a/lib/CL/devices/pthread/pthread_utils.c b/lib/CL/devices/pthread/pthread_utils.c
index 98e0144a2621c3c12e8a0e08522e83042e0ba1be..2b98274c567c477a22358d63435ca2815ea000a8 100644 (file)
--- a/lib/CL/devices/pthread/pthread_utils.c
+++ b/lib/CL/devices/pthread/pthread_utils.c
@@ -146,7 +146,7 @@ setup_kernel_arg_array (kernel_run_command *k)
       else if (meta->arg_info[i].type == POCL_ARG_TYPE_IMAGE)
         {
           dev_image_t di;
-          fill_dev_image_t(&di, al, k->device);
+          pocl_fill_dev_image_t (&di, al, k->device);
           void *devptr = pocl_aligned_malloc (MAX_EXTENDED_ALIGNMENT,
                                               sizeof (dev_image_t));
           arguments[i] = &arguments2[i];
@@ -156,7 +156,7 @@ setup_kernel_arg_array (kernel_run_command *k)
       else if (meta->arg_info[i].type == POCL_ARG_TYPE_SAMPLER)
         {
           dev_sampler_t ds;
-          fill_dev_sampler_t(&ds, al);
+          pocl_fill_dev_sampler_t (&ds, al);
 
           arguments[i] = &arguments2[i];
           arguments2[i] = (void *)ds;