[WIP] compile fixes

RenderKit · Oct 24, 2024 · 3250243 · 3250243
1 parent d198df9
commit 3250243
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/kernels/common/scene.h b/kernels/common/scene.h
@@ -40,7 +40,6 @@ namespace embree
     ALIGNED_CLASS_USM_(std::alignment_of<Scene>::value);
 
   public:
-#if !defined(__SYCL_DEVICE_ONLY__)
     template<typename Ty, bool mblur = false>
       class Iterator
       {
@@ -143,7 +142,6 @@ namespace embree
       Geometry::GTypeMask typemask;
       bool mblur;
     };
-#endif
 
   public:
 
@@ -254,7 +252,7 @@ namespace embree
 
     template<typename Mesh>
     __forceinline Mesh* getSafe(size_t i) {
-      if (geometries_device[i] == null) return nullptr;
+      if (geometries_device[i] == nullptr) return nullptr;
       if (!(geometries_device[i]->getTypeMask() & Mesh::geom_type)) return nullptr;
       else return (Mesh*) geometries_device[i];
     }

diff --git a/kernels/common/scene_triangle_mesh.h b/kernels/common/scene_triangle_mesh.h
@@ -144,7 +144,6 @@ namespace embree
       return madd(Vec3fa(t0),v0,t1*v1);
     }
 
-#if !defined(__SYCL_DEVICE_ONLY__)
     /*! calculates the bounds of the i'th triangle */
     __forceinline BBox3fa bounds(size_t i) const 
     {
@@ -263,7 +262,6 @@ namespace embree
     bool topologyChanged(unsigned int otherVersion) const {
       return triangles.isModified(otherVersion); // || numPrimitivesChanged;
     }
-#endif // !defined(__SYCL_DEVICE_ONLY__)
 
     /* returns the projected area */
     __forceinline float projectedPrimitiveArea(const size_t i) const {