Commit: 00acf4b816abf632602ff15e47309b07b1fa7cfc
Author: Thomas Dinges
Date: Tue Sep 2 23:26:29 2014 +0200
Branches: master
https://developer.blender.org/rB00acf4b816abf632602ff15e47309b07b1fa7cfc
Cleanup: Use function call and delete obsolete comment.
===================================================================
M intern/cycles/kernel/svm/svm_convert.h
M intern/cycles/util/util_math.h
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_convert.h
b/intern/cycles/kernel/svm/svm_convert.h
index 2503912..b221e07 100644
--- a/intern/cycles/kernel/svm/svm_convert.h
+++ b/intern/cycles/kernel/svm/svm_convert.h
@@ -45,13 +45,13 @@ ccl_device void svm_node_convert(ShaderData *sd, float
*stack, uint type, uint f
}
case NODE_CONVERT_VF: {
float3 f = stack_load_float3(stack, from);
- float g = (f.x + f.y + f.z)*(1.0f/3.0f);
+ float g = average(f);
stack_store_float(stack, to, g);
break;
}
case NODE_CONVERT_VI: {
float3 f = stack_load_float3(stack, from);
- int i = (int)((f.x + f.y + f.z)*(1.0f/3.0f));
+ int i = (int)average(f);
stack_store_int(stack, to, i);
break;
}
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 4ccb5f3..1cd8883 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -842,7 +842,6 @@ ccl_device_inline float4 max(float4 a, float4 b)
ccl_device_inline float4 select(const int4& mask, const float4& a, const
float4& b)
{
#ifdef __KERNEL_SSE__
- /* blendv is sse4, and apparently broken on vs2008 */
return _mm_or_ps(_mm_and_ps(_mm_cvtepi32_ps(mask), a),
_mm_andnot_ps(_mm_cvtepi32_ps(mask), b)); /* todo: avoid cvt */
#else
return make_float4((mask.x)? a.x: b.x, (mask.y)? a.y: b.y, (mask.z)?
a.z: b.z, (mask.w)? a.w: b.w);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
