Cycles: Remove unused BVH Builder using Embree BVH

10 files changed, 3 insertions, 455 deletions

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 4da89ebd4a1..88dbfcdcc1e 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -61,7 +61,6 @@ enum_bvh_builder = (
     ('INTERNAL', "Internal", "Use old internal BVH builder"),
     ('EMBREE', "Embree", "Use full featured embree (only on CPU)"),
     ('EMBREE_CONVERT', "Embree, then convert", "Use embree, then convert it to BVH2"),
-    ('EMBREE_BUILDER', "Embree builder", "Use Embree BVH Builder"),
 )
 
 enum_bvh_types = (
diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index e249c86f403..9a88076db10 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -702,9 +702,6 @@ SceneParams BlenderSync::get_scene_params(BL::Scene &b_scene, bool background)
   case 2:
       params.bvh_layout = BVH_LAYOUT_EMBREE_CONVERTED;
       break;
-  case 3:
-      params.bvh_layout = BVH_LAYOUT_EMBREE_GPU;
-      break;
   }
 #endif
   return params;
diff --git a/intern/cycles/bvh/CMakeLists.txt b/intern/cycles/bvh/CMakeLists.txt
index f85a484a194..740ecaacca8 100644
--- a/intern/cycles/bvh/CMakeLists.txt
+++ b/intern/cycles/bvh/CMakeLists.txt
@@ -14,7 +14,6 @@ set(SRC
   bvh_binning.cpp
   bvh_build.cpp
   bvh_embree.cpp
-  bvh_embree_gpu.cpp
   bvh_node.cpp
   bvh_sort.cpp
   bvh_split.cpp
@@ -30,7 +29,6 @@ set(SRC_HEADERS
   bvh_binning.h
   bvh_build.h
   bvh_embree.h
-  bvh_embree_gpu.h
   bvh_node.h
   bvh_params.h
   bvh_sort.h
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp
index 715651c96a8..525af8123d4 100644
--- a/intern/cycles/bvh/bvh.cpp
+++ b/intern/cycles/bvh/bvh.cpp
@@ -28,7 +28,6 @@
 
 #ifdef WITH_EMBREE
 #  include "bvh/bvh_embree.h"
-#  include "bvh/bvh_embree_gpu.h"
 #endif
 
 #include "util/util_foreach.h"
@@ -54,8 +53,6 @@ const char *bvh_layout_name(BVHLayout layout)
       return "EMBREE";
     case BVH_LAYOUT_EMBREE_CONVERTED:
       return "EMBREE_CONVERTED";
-    case BVH_LAYOUT_EMBREE_GPU:
-      return "EMBREE_GPU";
     case BVH_LAYOUT_ALL:
       return "ALL";
   }
@@ -115,10 +112,6 @@ BVH *BVH::create(const BVHParams &params, const vector<Object *> &objects)
 #ifdef WITH_EMBREE
       return new BVHEmbree(params, objects);
 #endif
-    case BVH_LAYOUT_EMBREE_GPU:
-#ifdef WITH_EMBREE
-      return new BVHEmbreeGPU(params, objects);
-#endif
     case BVH_LAYOUT_NONE:
     case BVH_LAYOUT_ALL:
       break;
diff --git a/intern/cycles/bvh/bvh_embree_gpu.cpp b/intern/cycles/bvh/bvh_embree_gpu.cpp
deleted file mode 100644
index f7b6fa8bb3c..00000000000
--- a/intern/cycles/bvh/bvh_embree_gpu.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
- * Copyright 2018, Blender Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef WITH_EMBREE
-
-#include "bvh/bvh_embree_gpu.h"
-
-#include "render/mesh.h"
-#include "render/object.h"
-#include "util/util_foreach.h"
-#include "util/util_logging.h"
-#include "util/util_progress.h"
-
-CCL_NAMESPACE_BEGIN
-
-typedef struct {
-    BVHEmbreeGPU *bvhBldr;
-    Progress *p;
-} UserParams;
-
-
-BVHEmbreeGPU::BVHEmbreeGPU(const BVHParams& params_, const vector<Object*>& objects_)
-    : BVH2(params_, objects_), stats(nullptr)
-{
-    _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON);
-    _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON);
-    this->rtc_device = rtcNewDevice("verbose=1");
-
-    rtcSetDeviceErrorFunction(this->rtc_device, [](void*, enum RTCError, const char* str) {
-        VLOG(1) << str;
-    }, nullptr);
-
-    pack.root_index = -1;
-}
-
-BVHEmbreeGPU::~BVHEmbreeGPU()
-{
-    rtcReleaseDevice(this->rtc_device);
-}
-
-ccl::BoundBox RTCBoundBoxToCCL(const RTCBounds *bound) {
-    return ccl::BoundBox(
-                make_float3(bound->lower_x, bound->lower_y, bound->lower_z),
-                make_float3(bound->upper_x, bound->upper_y, bound->upper_z));
-
-}
-ccl::BoundBox RTCBuildPrimToCCL(const RTCBuildPrimitive &bound) {
-    return ccl::BoundBox(
-                make_float3(bound.lower_x, bound.lower_y, bound.lower_z),
-                make_float3(bound.upper_x, bound.upper_y, bound.upper_z));
-
-}
-
-void CCLBoundBoxToRTC(const ccl::BoundBox &bb, RTCBounds *bound) {
-    bound->lower_x = bb.min.x;
-    bound->lower_y = bb.min.y;
-    bound->lower_z = bb.min.z;
-
-    bound->upper_x = bb.max.x;
-    bound->upper_y = bb.max.y;
-    bound->upper_z = bb.max.z;
-}
-
-RTCBuildPrimitive makeBuildPrimitive(const BoundBox &bb, unsigned int geomId, unsigned int primId = -1) {
-    RTCBuildPrimitive prim;
-    prim.lower_x = bb.min.x;
-    prim.lower_y = bb.min.y;
-    prim.lower_z = bb.min.z;
-    prim.upper_x = bb.max.x;
-    prim.upper_y = bb.max.y;
-    prim.upper_z = bb.max.z;
-    prim.geomID = geomId;
-    prim.primID = primId;
-
-    return prim;
-}
-
-void BVHEmbreeGPU::build(Progress& progress, Stats *stats_)
-{
-    this->stats = stats_;
-    rtcSetDeviceMemoryMonitorFunction(this->rtc_device, [](void* userPtr, const ssize_t bytes, const bool) -> bool {
-        Stats *stats = static_cast<Stats*>(userPtr);
-        if(stats == NULL) return true;
-
-        if(bytes > 0) {
-            stats->mem_alloc(static_cast<size_t>(bytes));
-        }
-        else {
-            stats->mem_free(static_cast<size_t>(-bytes));
-        }
-        return true;
-    }, stats);
-
-    progress.set_substatus("Building BVH");
-
-
-    struct RTCBuildArguments args = rtcDefaultBuildArguments();
-    args.byteSize = sizeof(args);
-
-    const bool dynamic = params.bvh_type == SceneParams::BVH_DYNAMIC;
-
-    args.buildFlags = (dynamic ? RTC_BUILD_FLAG_DYNAMIC : RTC_BUILD_FLAG_NONE);
-    args.buildQuality = dynamic ? RTC_BUILD_QUALITY_LOW :
-                                  ((params.use_spatial_split && !params.top_level) ? RTC_BUILD_QUALITY_HIGH : RTC_BUILD_QUALITY_MEDIUM);
-
-    /* Count triangles first so we can reserve arrays once. */
-    size_t prim_count = 0;
-
-    foreach(Object *ob, objects) {
-        if(params.top_level && ob->mesh->is_instanced()) {
-            prim_count += 1;
-        } else {
-            prim_count += ob->mesh->num_triangles();
-        }
-    }
-
-    pack.prim_object.reserve(prim_count);
-    pack.prim_type.reserve(prim_count);
-    pack.prim_index.reserve(prim_count);
-    pack.prim_tri_index.reserve(prim_count);
-
-    this->offset.resize(objects.size());
-    unsigned int i = 0;
-
-    pack.object_node.clear();
-
-    vector<RTCBuildPrimitive> prims;
-    prims.reserve(objects.size() * 3);
-    foreach(Object *ob, objects) {
-        if (params.top_level && !ob->is_traceable())
-            continue;
-
-        if (params.top_level && ob->mesh->is_instanced()) {
-            args.maxLeafSize = 1;
-            const auto offset = pack.prim_index.size();
-            this->offset[i] = offset;
-
-            pack.prim_type.push_back_reserved(0);
-            pack.prim_index.push_back_reserved(-1);
-            pack.prim_object.push_back_reserved(i);
-
-            prims.push_back(makeBuildPrimitive(ob->bounds, i));
-        } else {
-            add_object(ob, i);
-
-            const float3 *mesh_verts = ob->mesh->verts.data();
-            const float3 *mesh_vert_steps = NULL;
-            size_t motion_steps = 1;
-
-            if (ob->mesh->has_motion_blur()) {
-                const Attribute *attr_motion_vertex = ob->mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
-                if (attr_motion_vertex) {
-                    mesh_vert_steps = attr_motion_vertex->data_float3();
-                    motion_steps = ob->mesh->motion_steps;
-                }
-            }
-
-            for(size_t tri = 0; tri < ob->mesh->num_triangles(); ++tri) {
-                BoundBox bb = BoundBox::empty;
-                Mesh::Triangle t = ob->mesh->get_triangle(tri);
-
-                for (uint step = 0; step < motion_steps; ++step) {
-                    float3 verts[3];
-                    t.verts_for_step(mesh_verts, mesh_vert_steps, ob->mesh->num_triangles(), motion_steps, step, verts);
-
-                    bb.grow(verts[0]);
-                    bb.grow(verts[1]);
-                    bb.grow(verts[2]);
-                }
-
-                prims.push_back(makeBuildPrimitive(bb, i, tri));
-            }
-        }
-
-        ++i;
-        if(progress.get_cancel()) return;
-    }
-
-    if(progress.get_cancel()) {
-        stats = nullptr;
-        return;
-    }
-
-    args.bvh = rtcNewBVH(this->rtc_device);
-    args.maxBranchingFactor = 2;
-
-    args.primitives = prims.data();
-    args.primitiveCount = prims.size();
-    args.primitiveArrayCapacity = prims.capacity();
-
-    args.sahBlockSize = 1;
-    args.maxDepth = BVHParams::MAX_DEPTH;
-    args.traversalCost = this->params.sah_node_cost;
-    // 2 is a corrective factor for Embree (may depend on the scene for optimal results)
-    args.intersectionCost = this->params.sah_primitive_cost * 2;
-
-    args.createNode = [](RTCThreadLocalAllocator alloc, unsigned int numChildren, void*) -> void* {
-        CHECK_EQ(numChildren, 2) << "Should only have two children";
-        void* ptr = rtcThreadLocalAlloc(alloc,sizeof(InnerNode),16);
-        return new (ptr) InnerNode(BoundBox::empty);
-    };
-    args.setNodeBounds = [](void* nodePtr, const RTCBounds** bounds, unsigned int numChildren, void*) {
-        InnerNode *node = static_cast<InnerNode*>(nodePtr);
-        node->num_children_ = static_cast<int>(numChildren);
-        for (size_t i=0; i < numChildren; i++) {
-            node->bounds.grow(RTCBoundBoxToCCL(bounds[i]));
-        }
-    };
-    args.setNodeChildren = [](void* nodePtr, void** childPtr, unsigned int numChildren, void*) {
-        InnerNode *node = static_cast<InnerNode*>(nodePtr);
-        node->num_children_ = static_cast<int>(numChildren);
-        for (size_t i=0; i < numChildren; i++) {
-            node->children[i] = static_cast<BVHNode*>(childPtr[i]);
-        }
-    };
-    args.createLeaf = [](RTCThreadLocalAllocator alloc, const RTCBuildPrimitive* prims, size_t numPrims, void *user_ptr) -> void* {
-        UserParams *userParams = static_cast<UserParams*>(user_ptr);
-        void* ptr = rtcThreadLocalAlloc(alloc, sizeof(LeafNode), 16);
-
-        if(numPrims == 0) return new (ptr) LeafNode(BoundBox::empty, 0, 0, 0);
-
-        int min = std::numeric_limits<int>::max(),
-                max = 0;
-        uint visibility = 0;
-        BoundBox bounds = BoundBox::empty;
-
-        for(size_t i = 0; i < numPrims; i++) {
-            const Object *ob = userParams->bvhBldr->objects.at(prims[i].geomID);
-            const int idx = userParams->bvhBldr->offset[prims[i].geomID] + (prims[i].primID == -1 ? 0 : prims[i].primID);
-
-            if(idx < min) min = idx;
-            if(idx > max) max = idx;
-
-            visibility |= ob->visibility;
-            bounds.grow(RTCBuildPrimToCCL(prims[i]));
-        }
-
-        return new (ptr) LeafNode(bounds,
-                                  visibility,
-                                  min,
-                                  max + 1);
-    };
-
-    args.splitPrimitive = [](const struct RTCBuildPrimitive* prims, unsigned int dim, float pos, RTCBounds *l, RTCBounds *r, void *user_ptr) {
-        CHECK_LE(dim, 2) << "Dimension should be lower than 3";
-
-        UserParams *userParams = static_cast<UserParams*>(user_ptr);
-
-        const Object *ob = userParams->bvhBldr->objects.at(prims->geomID);
-        const float3 *mesh_verts = ob->mesh->verts.data();
-        const float3 *mesh_vert_steps = NULL;
-        size_t motion_steps = 1;
-
-        if (ob->mesh->has_motion_blur()) {
-            const Attribute *attr_motion_vertex = ob->mesh->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
-            if (attr_motion_vertex) {
-                mesh_vert_steps = attr_motion_vertex->data_float3();
-                motion_steps = ob->mesh->motion_steps;
-            }
-        }
-
-        Mesh::Triangle t = ob->mesh->get_triangle(prims->primID);
-
-        BoundBox left_bounds = BoundBox::empty;
-        BoundBox right_bounds = BoundBox::empty;
-
-        for (uint step = 0; step < motion_steps; ++step) {
-            float3 verts[3];
-            t.verts_for_step(mesh_verts, mesh_vert_steps, ob->mesh->num_triangles(), motion_steps, step, verts);
-
-            float3 v1 = verts[2];
-
-            for (int i = 0; i < 3; i++) {
-                float3 v0 = v1;
-                v1 = verts[i];
-                float v0p = v0[dim];
-                float v1p = v1[dim];
-
-                /* insert vertex to the boxes it belongs to. */
-                if (v0p <= pos)
-                    left_bounds.grow(v0);
-
-                if (v0p >= pos)
-                    right_bounds.grow(v0);
-
-                /* edge intersects the plane => insert intersection to both boxes. */
-                if ((v0p < pos && v1p > pos) || (v0p > pos && v1p < pos)) {
-                    float3 t = lerp(v0, v1, clamp((pos - v0p) / (v1p - v0p), 0.0f, 1.0f));
-                    left_bounds.grow(t);
-                    right_bounds.grow(t);
-                }
-            }
-        }
-
-        CCLBoundBoxToRTC(left_bounds, l);
-        CCLBoundBoxToRTC(right_bounds, r);
-    };
-    args.buildProgress = [](void* user_ptr, const double n) -> bool {
-        UserParams *userParams = static_cast<UserParams*>(user_ptr);
-
-        if(time_dt() - userParams->bvhBldr->progress_start_time < 0.25) {
-            return true;
-        }
-
-        string msg = string_printf("Building BVH (embree) %.0f%%", n * 100.0);
-        userParams->p->set_substatus(msg);
-        userParams->bvhBldr->progress_start_time = time_dt();
-
-        return !userParams->p->get_cancel();
-    };
-
-    UserParams p;
-    p.bvhBldr = this;
-    p.p = &progress;
-    args.userPtr = &p;
-
-    BVHNode* root = static_cast<BVHNode*>(rtcBuildBVH(&args));
-    root->update_time();
-    root->update_visibility();
-
-    pack_primitives();
-
-    progress.set_substatus("Packing geometry");
-    pack_nodes(root);
-
-    rtcReleaseBVH(args.bvh);
-    stats = nullptr;
-}
-
-void BVHEmbreeGPU::add_object(const Object *ob, const unsigned int i)
-{
-    const auto offset = pack.prim_index.size();
-    this->offset[i] = offset;
-
-    Mesh *mesh = ob->mesh;
-
-    const size_t num_triangles = mesh->num_triangles();
-
-    size_t prim_object_size = pack.prim_object.size();
-    pack.prim_object.resize(prim_object_size + num_triangles);
-
-    size_t prim_type_size = pack.prim_type.size();
-    pack.prim_type.resize(prim_type_size + num_triangles);
-
-    size_t prim_index_size = pack.prim_index.size();
-    pack.prim_index.resize(prim_index_size + num_triangles);
-
-    for(size_t j = 0; j < num_triangles; ++j) {
-        pack.prim_object[prim_object_size + j] = static_cast<int>(i);
-        pack.prim_type[prim_type_size + j] = PRIMITIVE_TRIANGLE;
-        pack.prim_index[prim_index_size + j] = static_cast<int>(j);
-    }
-}
-
-BVHNode *BVHEmbreeGPU::widen_children_nodes(const BVHNode * /*root*/) {
-    DLOG(FATAL) << "Must not be called";
-    return NULL;
-}
-
-CCL_NAMESPACE_END
-
-#endif  /* WITH_EMBREE */
diff --git a/intern/cycles/bvh/bvh_embree_gpu.h b/intern/cycles/bvh/bvh_embree_gpu.h
deleted file mode 100644
index 86d9c26898a..00000000000
--- a/intern/cycles/bvh/bvh_embree_gpu.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2018, Blender Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __BVH_EMBREE_GPU_H__
-#define __BVH_EMBREE_GPU_H__
-
-#ifdef WITH_EMBREE
-
-#include <embree3/rtcore.h>
-
-#include "bvh/bvh.h"
-#include "bvh/bvh2.h"
-#include "bvh/bvh_params.h"
-#include "bvh/bvh_node.h"
-
-#include "util/util_thread.h"
-#include "util/util_types.h"
-#include "util/util_vector.h"
-
-CCL_NAMESPACE_BEGIN
-
-class Mesh;
-
-class BVHEmbreeGPU : public BVH2
-{
-public:
-    virtual void build(Progress& progress, Stats *stats) override;
-    virtual ~BVHEmbreeGPU() override;
-
-    virtual BVHNode *widen_children_nodes(const BVHNode *root) override;
-
-protected:
-    friend class BVH;
-    BVHEmbreeGPU(const BVHParams& params, const vector<Object*>& objects);
-
-    void add_object(const Object *ob, const unsigned int i);
-private:
-    RTCDevice rtc_device;
-    vector<size_t> offset;
-    double progress_start_time = 0;
-
-    Stats *stats;
-};
-
-
-CCL_NAMESPACE_END
-
-#endif  /* WITH_EMBREE */
-
-#endif  /* __BVH_EMBREE_GPU_H__ */
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 01dafcfca6e..813deae7ac5 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -338,7 +338,7 @@ class CPUDevice : public Device {
     }
 #endif
 #ifdef WITH_EMBREE
-    bvh_layout_mask |= BVH_LAYOUT_EMBREE | BVH_LAYOUT_EMBREE_CONVERTED | BVH_LAYOUT_EMBREE_GPU;
+    bvh_layout_mask |= BVH_LAYOUT_EMBREE | BVH_LAYOUT_EMBREE_CONVERTED;
 #endif /* WITH_EMBREE */
     return bvh_layout_mask;
   }
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 49d25914c7f..b009940a8c7 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -184,7 +184,7 @@ class CUDADevice : public Device {
 
   virtual BVHLayoutMask get_bvh_layout_mask() const
   {
-    return BVH_LAYOUT_BVH2 | BVH_LAYOUT_EMBREE_GPU | BVH_LAYOUT_EMBREE_CONVERTED;
+    return BVH_LAYOUT_BVH2 | BVH_LAYOUT_EMBREE_CONVERTED;
   }
 
   /*#ifdef NDEBUG
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 379ef7da4a4..e7953d6d28d 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1341,7 +1341,6 @@ typedef enum KernelBVHLayout {
   BVH_LAYOUT_BVH8 = (1 << 2),
   BVH_LAYOUT_EMBREE = (1 << 3),
   BVH_LAYOUT_EMBREE_CONVERTED = (1 << 4),
-  BVH_LAYOUT_EMBREE_GPU = (1 << 5),
   BVH_LAYOUT_DEFAULT = BVH_LAYOUT_BVH8,
   BVH_LAYOUT_ALL = (unsigned int)(-1),
 } KernelBVHLayout;
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index edb2ef7c829..e6b5f78ffee 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -1980,7 +1980,7 @@ void MeshManager::device_update_bvh(Device *device,
   dscene->data.bvh.use_bvh_steps = (scene->params.num_bvh_time_steps != 0);
 
 #ifdef WITH_EMBREE
-  if(bparams.bvh_layout == BVH_LAYOUT_EMBREE_GPU || bparams.bvh_layout == BVH_LAYOUT_EMBREE_CONVERTED) {
+  if(bparams.bvh_layout == BVH_LAYOUT_EMBREE_CONVERTED) {
     dscene->data.bvh.bvh_layout = BVH_LAYOUT_BVH2;
   }