diff options
author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:27:41 +0300 |
---|---|---|
committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-11-07 16:30:09 +0300 |
commit | 9d0eac6ba5efe1b3712152c337fb171a771a8921 (patch) | |
tree | 8d51f1b3800513d37211253cc3f93f6c2a929ca4 /intern/cycles/device | |
parent | 0c8aa85069fabd20d5f030f016a85ad060839066 (diff) | |
parent | d3dd3739f6fe1ba640cdcad12d6bf4da6b356c59 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device_cpu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index 731d6c0d631..9e27a48b341 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -286,6 +286,9 @@ public: if(DebugFlags().cpu.has_avx2() && system_cpu_support_avx2()) { bvh_layout_mask |= BVH_LAYOUT_BVH8; } +#ifdef WITH_EMBREE + bvh_layout_mask |= BVH_LAYOUT_EMBREE; +#endif /* WITH_EMBREE */ return bvh_layout_mask; } @@ -702,6 +705,9 @@ public: int start_sample = tile.start_sample; int end_sample = tile.start_sample + tile.num_samples; + _MM_SET_FLUSH_ZERO_MODE(_MM_FLUSH_ZERO_ON); + _MM_SET_DENORMALS_ZERO_MODE(_MM_DENORMALS_ZERO_ON); + for(int sample = start_sample; sample < end_sample; sample++) { if(task.get_cancel() || task_pool.canceled()) { if(task.need_finish_queue == false) |