Merge branch 'master' into refactor-mesh-material-index-genericrefactor-mesh-material-index-generic

1 files changed, 85 insertions, 1 deletions

diff --git a/intern/cycles/kernel/svm/mix.h b/intern/cycles/kernel/svm/mix.h
index a9796096410..ead2fc44685 100644
--- a/intern/cycles/kernel/svm/mix.h
+++ b/intern/cycles/kernel/svm/mix.h
@@ -21,10 +21,94 @@ ccl_device_noinline int svm_node_mix(KernelGlobals kg,
   float fac = stack_load_float(stack, fac_offset);
   float3 c1 = stack_load_float3(stack, c1_offset);
   float3 c2 = stack_load_float3(stack, c2_offset);
-  float3 result = svm_mix((NodeMix)node1.y, fac, c1, c2);
+  float3 result = svm_mix_clamped_factor((NodeMix)node1.y, fac, c1, c2);
 
   stack_store_float3(stack, node1.z, result);
   return offset;
 }
 
+ccl_device_noinline void svm_node_mix_color(ccl_private ShaderData *sd,
+                                            ccl_private float *stack,
+                                            uint options,
+                                            uint input_offset,
+                                            uint result_offset)
+{
+  uint use_clamp, blend_type, use_clamp_result;
+  uint fac_in_stack_offset, a_in_stack_offset, b_in_stack_offset;
+  svm_unpack_node_uchar3(options, &use_clamp, &blend_type, &use_clamp_result);
+  svm_unpack_node_uchar3(
+      input_offset, &fac_in_stack_offset, &a_in_stack_offset, &b_in_stack_offset);
+
+  float t = stack_load_float(stack, fac_in_stack_offset);
+  if (use_clamp > 0) {
+    t = saturatef(t);
+  }
+  float3 a = stack_load_float3(stack, a_in_stack_offset);
+  float3 b = stack_load_float3(stack, b_in_stack_offset);
+  float3 result = svm_mix((NodeMix)blend_type, t, a, b);
+  if (use_clamp_result) {
+    result = saturate(result);
+  }
+  stack_store_float3(stack, result_offset, result);
+}
+
+ccl_device_noinline void svm_node_mix_float(ccl_private ShaderData *sd,
+                                            ccl_private float *stack,
+                                            uint use_clamp,
+                                            uint input_offset,
+                                            uint result_offset)
+{
+  uint fac_in_stack_offset, a_in_stack_offset, b_in_stack_offset;
+  svm_unpack_node_uchar3(
+      input_offset, &fac_in_stack_offset, &a_in_stack_offset, &b_in_stack_offset);
+
+  float t = stack_load_float(stack, fac_in_stack_offset);
+  if (use_clamp > 0) {
+    t = saturatef(t);
+  }
+  float a = stack_load_float(stack, a_in_stack_offset);
+  float b = stack_load_float(stack, b_in_stack_offset);
+  float result = a * (1 - t) + b * t;
+
+  stack_store_float(stack, result_offset, result);
+}
+
+ccl_device_noinline void svm_node_mix_vector(ccl_private ShaderData *sd,
+                                             ccl_private float *stack,
+                                             uint input_offset,
+                                             uint result_offset)
+{
+  uint use_clamp, fac_in_stack_offset, a_in_stack_offset, b_in_stack_offset;
+  svm_unpack_node_uchar4(
+      input_offset, &use_clamp, &fac_in_stack_offset, &a_in_stack_offset, &b_in_stack_offset);
+
+  float t = stack_load_float(stack, fac_in_stack_offset);
+  if (use_clamp > 0) {
+    t = saturatef(t);
+  }
+  float3 a = stack_load_float3(stack, a_in_stack_offset);
+  float3 b = stack_load_float3(stack, b_in_stack_offset);
+  float3 result = a * (one_float3() - t) + b * t;
+  stack_store_float3(stack, result_offset, result);
+}
+
+ccl_device_noinline void svm_node_mix_vector_non_uniform(ccl_private ShaderData *sd,
+                                                         ccl_private float *stack,
+                                                         uint input_offset,
+                                                         uint result_offset)
+{
+  uint use_clamp, fac_in_stack_offset, a_in_stack_offset, b_in_stack_offset;
+  svm_unpack_node_uchar4(
+      input_offset, &use_clamp, &fac_in_stack_offset, &a_in_stack_offset, &b_in_stack_offset);
+
+  float3 t = stack_load_float3(stack, fac_in_stack_offset);
+  if (use_clamp > 0) {
+    t = saturate(t);
+  }
+  float3 a = stack_load_float3(stack, a_in_stack_offset);
+  float3 b = stack_load_float3(stack, b_in_stack_offset);
+  float3 result = a * (one_float3() - t) + b * t;
+  stack_store_float3(stack, result_offset, result);
+}
+
 CCL_NAMESPACE_END