[Bf-blender-cvs] [6cdc954e8c] master: Cycles: Pass special flag whether BVH motion steps are used
Sergey Sharybin
noreply at git.blender.org
Wed Feb 15 13:04:07 CET 2017
Commit: 6cdc954e8c41a19ae1e6ef3e8d5c375dd3f646a5
Author: Sergey Sharybin
Date: Wed Feb 15 10:48:02 2017 +0100
Branches: master
https://developer.blender.org/rB6cdc954e8c41a19ae1e6ef3e8d5c375dd3f646a5
Cycles: Pass special flag whether BVH motion steps are used
Doesn't currently change anything, but would need for some future
work here.
It uses existing padding in kernel BVH structure, so there is
nothing changed memory-wise.
===================================================================
M intern/cycles/kernel/kernel_types.h
M intern/cycles/render/mesh.cpp
===================================================================
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index f518530106..8250eaf607 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1202,7 +1202,8 @@ typedef struct KernelBVH {
int have_curves;
int have_instancing;
int use_qbvh;
- int pad1, pad2;
+ int use_bvh_steps;
+ int pad1;
} KernelBVH;
static_assert_align(KernelBVH, 16);
diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 42dd4da8d0..b7660297f3 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -1880,6 +1880,7 @@ void MeshManager::device_update_bvh(Device *device, DeviceScene *dscene, Scene *
dscene->data.bvh.root = pack.root_index;
dscene->data.bvh.use_qbvh = scene->params.use_qbvh;
+ dscene->data.bvh.use_bvh_steps = (scene->params.num_bvh_time_steps != 0);
}
void MeshManager::device_update_flags(Device * /*device*/,
More information about the Bf-blender-cvs
mailing list