Minor fixes from code review II.

KhronosGroup · Nov 17, 2023 · 7e86c4f · 7e86c4f
1 parent 286d76e
commit 7e86c4f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/samples/core/callback/CMakeLists.txt b/samples/core/callback/CMakeLists.txt
@@ -45,9 +45,9 @@ endif()
 
 add_sample(
     TEST
-    TARGET callback_cpp
+    TARGET callbackcpp
     VERSION 300
     SOURCES main.cpp
     KERNELS reaction_diffusion.cl)
-target_link_libraries(callback_cpp PRIVATE
+target_link_libraries(callbackcpp PRIVATE
     $<TARGET_NAME_IF_EXISTS:Threads::Threads>)
diff --git a/samples/core/callback/main.c b/samples/core/callback/main.c
@@ -448,32 +448,36 @@ int main(int argc, char* argv[])
         state.img_b = tmp;
     }
 
+    // Make sure that all queued items are dispatched for execution
+    OCLERROR_RET(clFlush(state.compute_queue), error, read_ev);
+    OCLERROR_RET(clFlush(state.copy_queue), error, read_ev);
+    OCLERROR_RET(clFlush(state.read_queue), error, read_ev);
+
     size_t num_saved_images =
         (cb_opts.iterations + cb_opts.write_iter - 1) / cb_opts.write_iter;
 
     for (;;)
     {
-        THRDERROR(mtx_lock(&g_state.image_save_finished_mtx), error,
-                  free_image_b);
+        THRDERROR(mtx_lock(&g_state.image_save_finished_mtx), error, read_ev);
         bool wait_for_saving =
             num_saved_images != g_state.image_save_finished_count;
         if (wait_for_saving)
         {
             cnd_wait(&g_state.image_save_finished_signal,
                      &g_state.image_save_finished_mtx);
             THRDERROR(mtx_unlock(&g_state.image_save_finished_mtx), error,
-                      free_image_b);
+                      read_ev);
         }
         else
         {
             THRDERROR(mtx_unlock(&g_state.image_save_finished_mtx), error,
-                      free_image_b);
+                      read_ev);
             break;
         }
     }
 
     cl_int end_error = CL_SUCCESS;
-    // read_ev:
+read_ev:
     OCLERROR_RET(clReleaseEvent(state.read_event), end_error, copy_ev);
 copy_ev:
     OCLERROR_RET(clReleaseEvent(state.copy_event), end_error, compute_ev);