Skip to content

Commit

Permalink
Fix embree build
Browse files Browse the repository at this point in the history
  • Loading branch information
Speierers committed Jul 28, 2020
1 parent 1c794ad commit b5aed8e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
2 changes: 0 additions & 2 deletions src/librender/scene_embree.inl
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ MTS_VARIANT void Scene<Float, Spectrum>::accel_init_cpu(const Properties &/*prop
}

MTS_VARIANT void Scene<Float, Spectrum>::accel_release_cpu() {
for (Shape *shapegroup : m_shapegroups)
shapegroup->release_embree_scene();
rtcReleaseScene((RTCScene) m_accel);
}

Expand Down
8 changes: 0 additions & 8 deletions src/librender/shape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,6 @@ MTS_VARIANT RTCGeometry Shape<Float, Spectrum>::embree_geometry(RTCDevice device
Throw("embree_geometry() should only be called in CPU mode.");
}
}

MTS_VARIANT void Shape<Float, Spectrum>::init_embree_scene(RTCDevice /*device*/){
NotImplementedError("init_embree_scene");
}

MTS_VARIANT void Shape<Float, Spectrum>::release_embree_scene(){
NotImplementedError("release_embree_scene");
}
#endif

#if defined(MTS_ENABLE_OPTIX)
Expand Down
2 changes: 1 addition & 1 deletion src/librender/shapegroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MTS_VARIANT ShapeGroup<Float, Spectrum>::~ShapeGroup() {
}

#if defined(MTS_ENABLE_EMBREE)
MTS_VARIANT RTCGeometry ShapeGroup<Float, Spectrum>::embree_geometry(RTCDevice device) override {
MTS_VARIANT RTCGeometry ShapeGroup<Float, Spectrum>::embree_geometry(RTCDevice device) {
if constexpr (!is_cuda_array_v<Float>) {
// Construct the BVH only once
if (m_embree_scene == nullptr) {
Expand Down

0 comments on commit b5aed8e

Please sign in to comment.