[Bf-blender-cvs] [d115673] soc-2014-cycles: Cycles: Update AVX2 kernel for recent changes.

[Thomas Dinges]

Commit: d115673fc93470d0eee15438aab2c767b17237f6
Author: Thomas Dinges
Date:   Fri May 30 01:29:52 2014 +0200
https://developer.blender.org/rBd115673fc93470d0eee15438aab2c767b17237f6

Cycles: Update AVX2 kernel for recent changes.

===================================================================

M       intern/cycles/kernel/kernel_avx2.cpp

===================================================================

diff --git a/intern/cycles/kernel/kernel_avx2.cpp 
b/intern/cycles/kernel/kernel_avx2.cpp
index 2ca4473..0a20ff2 100644
--- a/intern/cycles/kernel/kernel_avx2.cpp
+++ b/intern/cycles/kernel/kernel_avx2.cpp
@@ -71,7 +71,10 @@ void kernel_cpu_avx2_convert_to_half_float(KernelGlobals 
*kg, uchar4 *rgba, floa
 
 void kernel_cpu_avx2_shader(KernelGlobals *kg, uint4 *input, float4 *output, 
int type, int i)
 {
-       kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, i);
+       if(type >= SHADER_EVAL_BAKE)
+               kernel_bake_evaluate(kg, input, output, (ShaderEvalType)type, 
i);
+       else
+               kernel_shader_evaluate(kg, input, output, (ShaderEvalType)type, 
i);
 }
 
 CCL_NAMESPACE_END

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs