workaround to respect alignment of tbb:task_group

Author: svenwoop

kernels/common/scene.cpp

@@ -27,16 +27,6 @@ namespace embree
   {
     device->refInc();
 
-#if defined(TASKING_INTERNAL) 
-    scheduler = nullptr;
-#elif defined(TASKING_TBB) && TASKING_TBB_USE_TASK_ISOLATION
-    group = new tbb::isolated_task_group;
-#elif defined(TASKING_TBB)
-    group = new tbb::task_group;
-#elif defined(TASKING_PPL)
-    group = new concurrency::task_group;
-#endif
-
     intersectors = Accel::Intersectors(missing_rtcCommit);
 
     /* one can overwrite flags through device for debugging */
@@ -46,11 +36,8 @@ namespace embree
       scene_flags = (RTCSceneFlags) device->scene_flags;
   }
 
-  Scene::~Scene () 
+  Scene::~Scene() noexcept
   {
-#if defined(TASKING_TBB) || defined(TASKING_PPL)
-    delete group; group = nullptr;
-#endif
     device->refDec();
   }
 
@@ -843,12 +830,12 @@ namespace embree
 
 #if USE_TASK_ARENA
         if (join) {
-          device->arena->execute([&]{ group->wait(); });
+          device->arena->execute([&]{ group.wait(); });
         }
         else
 #endif
         {
-          group->wait();
+          group.wait();
         }
 
         pause_cpu();
@@ -875,19 +862,19 @@ namespace embree
       if (join)
       {
         device->arena->execute([&]{
-            group->run([&]{
+            group.run([&]{
                 tbb::parallel_for (size_t(0), size_t(1), size_t(1), [&] (size_t) { commit_task(); }, ctx);
               });
-            group->wait();
+            group.wait();
           });
       }
       else
 #endif
       {
-        group->run([&]{
+        group.run([&]{
             tbb::parallel_for (size_t(0), size_t(1), size_t(1), [&] (size_t) { commit_task(); }, ctx);
           });
-        group->wait();
+        group.wait();
       }
 
       /* reset MXCSR register again */
@@ -928,10 +915,10 @@ namespace embree
 
     try {
 
-      group->run([&]{
+      group.run([&]{
           concurrency::parallel_for(size_t(0), size_t(1), size_t(1), [&](size_t) { commit_task(); });
         });
-      group->wait();
+      group.wait();
 
        /* reset MXCSR register again */
       _mm_setcsr(mxcsr);

kernels/common/scene.h

@@ -26,7 +26,7 @@ namespace embree
   /*! Base class all scenes are derived from */
   class Scene : public AccelN
   {
-    ALIGNED_CLASS_(16);
+    ALIGNED_CLASS_(std::alignment_of<Scene>::value);
 
   public:
     template<typename Ty, bool mblur = false>
@@ -137,7 +137,7 @@ namespace embree
     Scene (Device* device);
 
     /*! Scene destruction */
-    ~Scene ();
+    ~Scene () noexcept;
 
   private:
     /*! class is non-copyable */
@@ -302,11 +302,11 @@ namespace embree
     MutexSys schedulerMutex;
     Ref<TaskScheduler> scheduler;
 #elif defined(TASKING_TBB) && TASKING_TBB_USE_TASK_ISOLATION
-    tbb::isolated_task_group* group;
+    tbb::isolated_task_group group;
 #elif defined(TASKING_TBB)
-    tbb::task_group* group;
+    tbb::task_group group;
 #elif defined(TASKING_PPL)
-    concurrency::task_group* group;
+    concurrency::task_group group;
 #endif
 
   public: