Blender Git Loki

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Cycles: Use bool for is_leaf bvh property.

* This is not actually copied to the device, so we can use a bool here, which is smaller than a int.

Cycles: Optimize Equi-Angular sampling using binary range search.

Patch by Lukas Tönne and myself.

Cycles: Avoid some NULL checks and conditions in volume sampling code.

* Avoid segment NULL check in kernel_branched_path_volume_connect_light(), we access it before the function call already.
* Avoid SD_SCATTER flag check in kernel_volume_decoupled_scatter(), we check for this before already.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Cleanup: Don't check ls.pdf here, we already check for it in direct_emission().

Tweak for yesterdays volume shadow optimization.

* Avoid division and branching, suggested by Sergey.

Cycles: Optimization for Heterogeneous Volume Shadows.

* Don't compute expf() for every step, instead sum the intermediate values and calculate it every N (8 for now) steps.

This helps a few percent (~5% on a cube with wave texture) in my tests here.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Cycles: Further optimizations for Volume Light Sampling.

* Now we calculate ls->P only, which is needed for equi-angular sampling. If the scattering is successful, we call the regular light_sample() functions.

Cycles: Avoid redundant calculations for Lamps when using Decoupled Ray Marching.

* Split light_sample functions, so we can only recalculate the parts, that actually change due to the new position.
Gives a few percent speedup, especially in scenes with Branched Path, and Sample All Lights.

Cycles: Avoid intermediate function when we sample all lamps.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Conflicts:
intern/cycles/kernel/kernel_shader.h

Cycles: Memory optimization for shader id.

Pack the shader ID into the vert index float4 (which still had one empty component).
This way we save 1 float per mesh triangle.

As a bonus, this gives 1 GPU image texture slot back to sm_2x users.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

Cycles: Use new ssef helpers for QBVH Triangle Intersection. No functional changes.

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

This commit removes somd sincos() code + fma(), as the code in master changed too much in those places. I will re-check on that and add back eventually.

Conflicts:
intern/cycles/CMakeLists.txt
intern/cycles/SConscript
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/closure/bsdf_microfacet.h
intern/cycles/kernel/geom/geom_bvh_shadow.h
intern/cycles/kernel/geom/geom_bvh_subsurface.h
intern/cycles/kernel/geom/geom_bvh_traversal.h
intern/cycles/kernel/kernel_compat_cpu.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/nodes.cpp
intern/cycles/util/util_color.h
intern/cycles/util/util_optimization.h
intern/cycles/util/util_simd.h
source/blender/nodes/shader/nodes/node_shader_sepcombXYZ.c

Merge remote-tracking branch 'origin/master' into soc-2014-cycles