Make sure all the programs call clFinish()

3 files changed, 11 insertions, 25 deletions

diff --git a/get_global_id_2d.c b/get_global_id_2d.c
index 04aa309..47681a3 100644
--- a/get_global_id_2d.c
+++ b/get_global_id_2d.c
@@ -36,15 +36,13 @@ int main (int argc, char ** argv)
       return EXIT_FAILURE;
    }
 
-   error = clEnqueueNDRangeKernel(context.command_queue,
+   if (!clSimpleEnqueueNDRangeKernel(context.command_queue,
                                   context.kernel,
-                                  2, /* dimensions */
-                                  NULL,
+                                  2,
                                   global_work_size,
-                                  local_work_size,
-                                  0, NULL, NULL);
-
-   assert(error == CL_SUCCESS);
+                                  local_work_size)) {
+      return EXIT_FAILURE;
+   }
 
    error = clEnqueueReadBuffer(context.command_queue,
                                out_buffer,
diff --git a/math-int.c b/math-int.c
index 6eb11aa..e8b2c7d 100644
--- a/math-int.c
+++ b/math-int.c
@@ -87,19 +87,11 @@ int main(int argc, char ** argv)
       return EXIT_FAILURE;
    }
 
-   error = clEnqueueNDRangeKernel(command_queue,
+   if(!clSimpleEnqueueNDRangeKernel(command_queue,
                                   kernel,
                                   1, /* Number of dimensions */
-                                  NULL, /* Global work offset */
                                   &global_work_size,
-                                  &global_work_size, /* local work size */
-                                  0, /* Events in wait list */
-                                  NULL, /* Wait list */
-                                  NULL); /* Event object for this event */
-
-   if (error != CL_SUCCESS) {
-      fprintf(stderr, "clEnqueueNDRangeKernel() failed: %s\n",
-                      clUtilErrorString(error));
+                                  &global_work_size)) { /* local work size */
       return EXIT_FAILURE;
    }
 
diff --git a/memset.c b/memset.c
index 2cb1510..cfef313 100644
--- a/memset.c
+++ b/memset.c
@@ -64,15 +64,11 @@ int main (int argc, char ** argv)
       return EXIT_FAILURE;
    }
 
-   error = clEnqueueNDRangeKernel(context.command_queue,
+   if (!clSimpleEnqueueNDRangeKernel(context.command_queue,
                                   context.kernel,
-                                  1, NULL,
-                                  &global_work_size, &local_work_size,
-                                  0, NULL, NULL);
-
-   if (error != CL_SUCCESS) {
-      fprintf(stderr, "clEnqueueNDRangeKernel() failed: %s\n",
-              clUtilErrorString(error));
+                                  1,
+                                  &global_work_size, &local_work_size)) {
+      return EXIT_FAILURE;
    }
 
    if (!clSimpleReadOutput(&context, out_data, out_size)) {