change rtcCommit???WithQueue interface to return sycl::event

include/embree4/rtcore_buffer.h

@@ -52,7 +52,7 @@ RTC_API void rtcCommitBuffer(RTCBuffer buffer);
 
 #if defined(EMBREE_SYCL_SUPPORT) && defined(SYCL_LANGUAGE_VERSION)
 
-RTC_API void rtcCommitBufferWithQueue(RTCBuffer buffer, sycl::queue queue, sycl::event* event);
+RTC_API_CPP sycl::event rtcCommitBufferWithQueue(RTCBuffer buffer, sycl::queue queue);
 
 #endif
 

include/embree4/rtcore_device.h

@@ -34,7 +34,7 @@ RTC_API void rtcSetDeviceSYCLDevice(RTCDevice device, const sycl::device sycl_de
 
 /* rtcCommitSceneWithQueue is asynchronous, user has to call queue.wait()
    for synchronization. rtcCommitScene is blocking. */
-RTC_API void rtcCommitSceneWithQueue(RTCScene scene, sycl::queue queue, sycl::event* event);
+RTC_API_CPP sycl::event rtcCommitSceneWithQueue(RTCScene scene, sycl::queue queue);
 
 #endif
 

kernels/common/buffer.h

@@ -170,21 +170,18 @@ namespace embree
       DeviceGPU* gpu_device = dynamic_cast<DeviceGPU*>(device);
       if (gpu_device) {
         sycl::queue queue(gpu_device->getGPUDevice());
-        commit(queue, nullptr);
+        commit(queue);
         queue.wait_and_throw();
       }
 #endif
     }
 
 #if defined(EMBREE_SYCL_SUPPORT)
-    __forceinline void commit(sycl::queue queue, sycl::event* event) {
+    __forceinline sycl::event commit(sycl::queue queue) {
       if (dptr == ptr)
-        return;
+        return sycl::event();
 
-      sycl::event last_event = queue.memcpy(dptr, ptr, numBytes);
-
-      if (event)
-        *event = last_event;
+      return queue.memcpy(dptr, ptr, numBytes);
     }
 #endif
 

kernels/common/rtcore.cpp

@@ -83,25 +83,27 @@ RTC_NAMESPACE_BEGIN;
     RTC_CATCH_END(nullptr);
   }
 
-  RTC_API void rtcCommitSceneWithQueue (RTCScene hscene, sycl::queue queue, sycl::event* event)
+  RTC_API_CPP sycl::event rtcCommitSceneWithQueue (RTCScene hscene, sycl::queue queue)
   {
     Scene* scene = (Scene*) hscene;
     RTC_CATCH_BEGIN;
     RTC_TRACE(rtcCommitSceneWithQueue);
     RTC_VERIFY_HANDLE(hscene);
     RTC_ENTER_DEVICE(hscene);
-    scene->commit(false, queue, event);
+    return scene->commit(false, queue);
     RTC_CATCH_END2(scene);
+    return sycl::event();
   }
 
-  RTC_API void rtcCommitBufferWithQueue(RTCBuffer hbuffer, sycl::queue queue, sycl::event* event) {
+  RTC_API_CPP sycl::event rtcCommitBufferWithQueue(RTCBuffer hbuffer, sycl::queue queue) {
     Buffer* buffer = (Buffer*)hbuffer;
     RTC_CATCH_BEGIN;
     RTC_TRACE(rtcCommitBufferWithQueue);
     RTC_VERIFY_HANDLE(hbuffer);
     RTC_ENTER_DEVICE(hbuffer);
-    buffer->commit(queue, event);
+    return buffer->commit(queue);
     RTC_CATCH_END2(buffer);
+    return sycl::event();
   }
 
 #endif

kernels/common/scene.cpp

@@ -909,10 +909,10 @@ namespace embree
   }
 
 #if defined(EMBREE_SYCL_SUPPORT)
-  void Scene::commit (bool join, sycl::queue queue, sycl::event* event)
+  sycl::event Scene::commit (bool join, sycl::queue queue)
   {
     commit_internal(join);
-    syncWithDevice(queue, event);
+    return syncWithDevice(queue);
   }
 #endif
 

kernels/common/scene.h

@@ -194,7 +194,7 @@ namespace embree
     void build_gpu_accels();
     void commit_internal (bool join);
 #if defined(EMBREE_SYCL_SUPPORT)
-    void commit (bool join, sycl::queue queue, sycl::event* event);
+    sycl::event commit (bool join, sycl::queue queue);
 #endif
     void commit (bool join);
     void commit_task ();
@@ -319,7 +319,7 @@ namespace embree
 #if defined(EMBREE_SYCL_SUPPORT)
   private:
     void syncWithDevice();
-    void syncWithDevice(sycl::queue queue, sycl::event* event);
+    sycl::event syncWithDevice(sycl::queue queue);
 #endif
 
   public:

kernels/rtcore_config.h.in

@@ -36,13 +36,15 @@
 #  define RTC_NAMESPACE_END }
 #  define RTC_NAMESPACE_USE using namespace @EMBREE_API_NAMESPACE@;
 #  define RTC_API_EXTERN_C
+#  define RTC_API_EXTERN_CPP
 #  undef EMBREE_API_NAMESPACE
 #else
 #  define RTC_NAMESPACE_BEGIN
 #  define RTC_NAMESPACE_END
 #  define RTC_NAMESPACE_USE
 #  if defined(__cplusplus)
 #    define RTC_API_EXTERN_C extern "C"
+#    define RTC_API_EXTERN_CPP extern "C++"
 #  else
 #    define RTC_API_EXTERN_C
 #  endif
@@ -62,12 +64,32 @@
 #  define RTC_API_EXPORT RTC_API_EXTERN_C __attribute__ ((visibility ("default")))
 #endif
 
+#if defined(ISPC)
+#  define RTC_API_IMPORT_CPP extern "C++" unmasked
+#  define RTC_API_EXPORT_CPP extern "C++" unmasked
+#elif defined(EMBREE_STATIC_LIB)
+#  define RTC_API_IMPORT_CPP RTC_API_EXTERN_CPP
+#  define RTC_API_EXPORT_CPP RTC_API_EXTERN_CPP
+#elif defined(_WIN32)
+#  define RTC_API_IMPORT_CPP RTC_API_EXTERN_CPP __declspec(dllimport)
+#  define RTC_API_EXPORT_CPP RTC_API_EXTERN_CPP __declspec(dllexport)
+#else
+#  define RTC_API_IMPORT_CPP RTC_API_EXTERN_CPP
+#  define RTC_API_EXPORT_CPP RTC_API_EXTERN_CPP __attribute__ ((visibility ("default")))
+#endif
+
 #if defined(RTC_EXPORT_API)
 #  define RTC_API RTC_API_EXPORT
 #else
 #  define RTC_API RTC_API_IMPORT
 #endif
 
+#if defined(RTC_EXPORT_API)
+#  define RTC_API_CPP RTC_API_EXPORT_CPP
+#else
+#  define RTC_API_CPP RTC_API_IMPORT_CPP
+#endif
+
 #if defined(ISPC)
 #  define RTC_SYCL_INDIRECTLY_CALLABLE
 #elif defined(__SYCL_DEVICE_ONLY__)

kernels/sycl/scene_sycl.cpp

@@ -132,21 +132,21 @@ void Scene::syncWithDevice()
   }
 
   sycl::queue queue = sycl::queue(gpu_device->getGPUDevice());
-  syncWithDevice(queue, nullptr);
+  syncWithDevice(queue);
   queue.wait_and_throw();
 }
 
-void Scene::syncWithDevice(sycl::queue queue, sycl::event* event)
+sycl::event Scene::syncWithDevice(sycl::queue queue)
 {
   if(!device->is_gpu()) {
-    return;
+    return sycl::event();
   }
 
   // TODO: why is this compiled for __SYCL_DEVICE_ONLY__ ???
 #if !defined(__SYCL_DEVICE_ONLY__)
   accelBuffer.commit(queue);
 #endif
-  
+
   const bool dynamic_scene = getSceneFlags() & RTC_SCENE_FLAG_DYNAMIC;
 
   const bool num_geometries_changed = num_geometries != geometries.size();
@@ -225,9 +225,7 @@ void Scene::syncWithDevice(sycl::queue queue, sycl::event* event)
     scene_device = (Scene*) device->malloc(sizeof(Scene), 16, EmbreeMemoryType::USM_DEVICE);
   }
 
-  sycl::event last_event = queue.memcpy(scene_device, (void*)this, sizeof(Scene));
-  if (event)
-    *event = last_event;
+  return queue.memcpy(scene_device, (void*)this, sizeof(Scene));
 }
 
 #endif

tutorials/dynamic_scene/dynamic_scene_device.cpp

@@ -328,7 +328,7 @@ extern "C" void device_render (int* pixels,
   /* commit changes to scene */
   auto start_commit = std::chrono::high_resolution_clock::now();
 #if defined(EMBREE_SYCL_TUTORIAL)
-  rtcCommitSceneWithQueue (data.g_scene, *global_gpu_queue, nullptr);
+  rtcCommitSceneWithQueue (data.g_scene, *global_gpu_queue);
 #else
   rtcCommitScene (data.g_scene);
 #endif

tutorials/host_device_memory/host_device_memory_device.cpp

@@ -358,7 +358,7 @@ extern "C" void device_init (char* cfg)
 
   /* commit changes to scene */
 #if defined(EMBREE_SYCL_SUPPORT) && defined(EMBREE_SYCL_TUTORIAL)
-  rtcCommitSceneWithQueue (data.g_scene, *global_gpu_queue, nullptr);
+  rtcCommitSceneWithQueue (data.g_scene, *global_gpu_queue);
 #else
   rtcCommitScene (data.g_scene);
 #endif