archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Use function call and delete obsolete comment.

Browse Source
This commit is contained in:
Thomas Dinges
2014-09-02 23:26:29 +02:00
parent 1448082ba3
commit 00acf4b816
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/svm/svm_convert.h
View File

@@ -45,13 +45,13 @@ ccl_device void svm_node_convert(ShaderData *sd, float *stack, uint type, uint f
} }
case NODE_CONVERT_VF: { case NODE_CONVERT_VF: {
float3 f = stack_load_float3(stack, from); 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); stack_store_float(stack, to, g);
break; break;
} }
case NODE_CONVERT_VI: { case NODE_CONVERT_VI: {
float3 f = stack_load_float3(stack, from); 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); stack_store_int(stack, to, i);
break; break;
} }

1
intern/cycles/util/util_math.h
View File

@@ -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) ccl_device_inline float4 select(const int4& mask, const float4& a, const float4& b)
{ {
#ifdef __KERNEL_SSE__ #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 */ return _mm_or_ps(_mm_and_ps(_mm_cvtepi32_ps(mask), a), _mm_andnot_ps(_mm_cvtepi32_ps(mask), b)); /* todo: avoid cvt */
#else #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); 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);