diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-21 17:53:20 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-04-21 18:14:37 +0400 |
| commit | 04a10907dc41a3016374f9efc4820987cc7a5460 (patch) | |
| tree | d737a14c5876104e7da4f85ca9db898a1dd3dcad /intern/cycles/kernel/svm/svm.h | |
| parent | 7765b73f6d2002b074b7e78985171ef035075fbb (diff) | |
Code cleanup: remove old closure sampling code Cycles.
This was the original code to get things working on old GPUs, but now it is no
longer in use and various features in fact depend on this to work correctly to
the point that enabling this code is too buggy to be useful.
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 49351d14443..dbf59c60cb0 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -182,10 +182,9 @@ CCL_NAMESPACE_BEGIN /* Main Interpreter Loop */ -ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderType type, float randb, int path_flag) +ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderType type, int path_flag) { float stack[SVM_STACK_SIZE]; - float closure_weight = 1.0f; int offset = sd->shader & SHADER_MASK; while(1) { @@ -200,7 +199,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade break; } case NODE_CLOSURE_BSDF: - svm_node_closure_bsdf(kg, sd, stack, node, randb, path_flag, &offset); + svm_node_closure_bsdf(kg, sd, stack, node, path_flag, &offset); break; case NODE_CLOSURE_EMISSION: svm_node_closure_emission(sd, stack, node); @@ -227,10 +226,7 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade svm_node_emission_weight(kg, sd, stack, node); break; case NODE_MIX_CLOSURE: - svm_node_mix_closure(sd, stack, node, &offset, &randb); - break; - case NODE_ADD_CLOSURE: - svm_node_add_closure(sd, stack, node.y, node.z, &offset, &randb, &closure_weight); + svm_node_mix_closure(sd, stack, node); break; case NODE_JUMP_IF_ZERO: if(stack_load_float(stack, node.z) == 0.0f) @@ -442,9 +438,6 @@ ccl_device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, Shade #endif case NODE_END: default: -#ifndef __MULTI_CLOSURE__ - sd->closure.weight *= closure_weight; -#endif return; } } |