cleanups

Author: freibold

.gitignore

@@ -9,4 +9,5 @@ kernels/config.h
 kernels/hash.h
 include/embree4/rtcore_config.h
 build
+build*
 out

kernels/common/buffer.h

@@ -35,7 +35,6 @@ namespace embree
       device->refInc();
 
       ptr = alloc(ptr_in, shared, EmbreeMemoryType::SHARED);
-
 #if defined(EMBREE_SYCL_SUPPORT)
       dshared = true;
       dptr = ptr;
@@ -57,14 +56,11 @@ namespace embree
 #endif
       {
         ptr = alloc(ptr_in, shared, EmbreeMemoryType::SHARED);
-      }
-
 #if defined(EMBREE_SYCL_SUPPORT)
-      if (!dptr) {
         dshared = true;
         dptr = ptr;
-      }
 #endif
+      }
     }
 
     /*! Buffer destruction */

kernels/common/scene_instance.h

@@ -13,7 +13,6 @@ namespace embree
   /*! Instanced acceleration structure */
   struct Instance : public Geometry
   {
-    //ALIGNED_STRUCT_(16);
     static const Geometry::GTypeMask geom_type = Geometry::MTY_INSTANCE;
 
   public:

kernels/common/scene_instance_array.h

@@ -13,7 +13,6 @@ namespace embree
   /*! Instanced acceleration structure */
   struct InstanceArray : public Geometry
   {
-    //ALIGNED_STRUCT_(16);
     static const Geometry::GTypeMask geom_type = Geometry::MTY_INSTANCE_ARRAY;
 
   public:

kernels/common/scene_line_segments.cpp

@@ -224,7 +224,6 @@ namespace embree
         flags[i] |= hasRight * RTC_CURVE_FLAG_NEIGHBOR_RIGHT;
         hasLeft = hasRight;
       }
-      std::cout << "flags.buffer->commit()" << std::endl;
       flags.buffer->commit();
     }
     segments.clearLocalModified();

kernels/sycl/rthwif_embree.cpp

@@ -650,7 +650,6 @@ __forceinline void trav_loop(intel_ray_query_t& query, Ray& ray, Scene* scene, s
 
 SYCL_EXTERNAL __attribute__((always_inline)) void rtcIntersectRTHW(sycl::global_ptr<RTCTraversableTy> htraversable, sycl::private_ptr<RTCRayQueryContext> ucontext, sycl::private_ptr<RTCRayHit> rayhit_i, sycl::private_ptr<RTCIntersectArguments> args)
 {
-#if 0
   Scene* scene = (Scene*) htraversable.get();
 
   RayQueryContext context(scene, ucontext, args);
@@ -763,12 +762,10 @@ SYCL_EXTERNAL __attribute__((always_inline)) void rtcIntersectRTHW(sycl::global_
   }
 
   intel_ray_query_abandon(query);
-#endif
 }
 
 SYCL_EXTERNAL __attribute__((always_inline)) void rtcOccludedRTHW(sycl::global_ptr<RTCTraversableTy> htraversable, sycl::private_ptr<RTCRayQueryContext> ucontext, sycl::private_ptr<RTCRay> ray_i, sycl::private_ptr<RTCOccludedArguments> args)
 {
-#if 0
   Scene* scene = (Scene*) htraversable.get();
 
   RayQueryContext context(scene, ucontext, args);
@@ -817,7 +814,6 @@ SYCL_EXTERNAL __attribute__((always_inline)) void rtcOccludedRTHW(sycl::global_p
     ray_i->tfar = -INFINITY;
 
   intel_ray_query_abandon(query);
-#endif
 }
 
 RTC_NAMESPACE_END;

kernels/sycl/rthwif_embree_builder.cpp

@@ -705,15 +705,12 @@ namespace embree
       return;
     }
 
-    std::cout << "accelBufferHost.size(): " << accelBufferHost.size() << std::endl;
-    std::cout << "accelBufferDevice.size(): " << accelBufferDevice.size() << std::endl;
-
     accelBufferDevice.resize(accelBufferHost.size());
-    
+
     sycl::queue queue(deviceGPU->getGPUDevice());
     queue.memcpy(accelBufferDevice.data(), accelBufferHost.data(), accelBufferHost.size());
     queue.wait_and_throw();
-    
+
     std::vector<char> host_data(accelBufferHost.size());
     queue.memcpy(host_data.data(), accelBufferDevice.data(), accelBufferDevice.size());
     queue.wait_and_throw();
@@ -724,11 +721,7 @@ namespace embree
       }
     }
 
-    std::cout << "accelBufferHost.size(): " << accelBufferHost.size() << std::endl;
-    std::cout << "accelBufferDevice.size(): " << accelBufferDevice.size() << std::endl;
-
     hwaccel = (char*)accelBufferDevice.data();
-    printf("hwaccel %p\n", hwaccel);
   }
 
 }