Page MenuHome
Differential D1463 Diff 4860 intern/cycles/kernel/svm/svm_voronoi.h

Changeset View

Standalone View

View Options

intern/cycles/kernel/svm/svm_voronoi.h

Context not available.
/* Voronoi */ /* Voronoi */
ccl_device float voronoi_F1_distance(float3 p)
ccl_device float2 voronoi_F1_distance(float3 p, NodeVoronoiDistanceMetric distance_metric)
{ {
/* returns squared distance in da */ /* returns distance to the nearest point in da, and the distance to the second nearest point in da2 */
/* the distance is calculated using several different distance metrics, the default is distance squared */
float da = 1e10f; float da = 1e10f;
float da2= 1e10f;
/* implementation note: for performance it might be better to lift the switch statement outside the loops or even */
/* invoke different functions. The gain however is uncertain and because it is fast enough already, complicating */
/* the code and duplicating quite a number of lines probably isn't worth it, after all the code is already dupped twice */
/* Their might also be some very small performance improvements possible in de SSE2 code, especially in the manhattan */
/* metric, where and absolute value is calculated for all vector components and then the vector is reduced */
#ifndef __KERNEL_SSE2__ #ifndef __KERNEL_SSE2__
int ix = floor_to_int(p.x), iy = floor_to_int(p.y), iz = floor_to_int(p.z); int ix = floor_to_int(p.x), iy = floor_to_int(p.y), iz = floor_to_int(p.z);
Context not available.
for(int zz = -1; zz <= 1; zz++) { for(int zz = -1; zz <= 1; zz++) {
float3 ip = make_float3(ix + xx, iy + yy, iz + zz); float3 ip = make_float3(ix + xx, iy + yy, iz + zz);
float3 vp = ip + cellnoise_color(ip); float3 vp = ip + cellnoise_color(ip);
float d = len_squared(p - vp); float d;
da = min(d, da); switch(distance_metric){
default:
d = len_squared(p - vp);
break;
case NODE_VORONOI_DISTANCE:
d = sqrtf(len_squared(p - vp));
break;
case NODE_VORONOI_MANHATTAN:
vp = vp - p;
d = fabsf(vp.x) + fabsf(vp.y) + fabsf(vp.z);
break;
case NODE_VORONOI_CHEBYCHEV:
vp = vp - p;
d = fmaxf(fabsf(vp.x), fmaxf(fabsf(vp.y), fabsf(vp.z)));
break;
}
/* to keep the shortest two distances we have to keep them in sorted order, hence the two comparisons */
if(d < da){
da2 = da;
da = d;
}else if(d < da2){
da2 = d;
}
} }
} }
} }
Context not available.
for(int zz = -1; zz <= 1; zz++) { for(int zz = -1; zz <= 1; zz++) {
ssef ip = ssef(xyzi + ssei(xx, yy, zz, 0)); ssef ip = ssef(xyzi + ssei(xx, yy, zz, 0));
ssef vp = ip + cellnoise_color(ip); ssef vp = ip + cellnoise_color(ip);
float d = len_squared<1, 1, 1, 0>(vec_p - vp); float d;
da = min(d, da); switch(distance_metric){
default:
d = len_squared<1, 1, 1, 0>(vec_p - vp);
break;
case NODE_VORONOI_DISTANCE:
d = sqrtf(len_squared<1, 1, 1, 0>(vec_p - vp));
break;
case NODE_VORONOI_MANHATTAN:
vp -= vec_p;
d = fabsf(vp[0]) + fabsf(vp[1]) + fabsf(vp[2]);
break;
case NODE_VORONOI_CHEBYCHEV:
vp -= vec_p;
d = fmaxf(fabsf(vp[0]), fmaxf(fabsf(vp[1]), fabsf(vp[2])));
break;
}
/* to keep the shortest two distances we have to keep them in sorted order, hence the two comparisons */
if(d < da){
da2 = da;
da = d;
}else if(d < da2){
da2 = d;
}
} }
} }
} }
#endif #endif
return da; return make_float2(da,da2);
} }
ccl_device float3 voronoi_F1_color(float3 p) ccl_device float3 voronoi_F1_color(float3 p, NodeVoronoiDistanceMetric distance_metric)
{ {
/* returns color of the nearest point */ /* returns color of the nearest point */
float da = 1e10f; float da = 1e10f;
Context not available.
for(int zz = -1; zz <= 1; zz++) { for(int zz = -1; zz <= 1; zz++) {
float3 ip = make_float3(ix + xx, iy + yy, iz + zz); float3 ip = make_float3(ix + xx, iy + yy, iz + zz);
float3 vp = ip + cellnoise_color(ip); float3 vp = ip + cellnoise_color(ip);
float d = len_squared(p - vp); float d;
switch(distance_metric){
default:
d = len_squared(p - vp);
break;
case NODE_VORONOI_DISTANCE:
d = sqrtf(len_squared(p - vp));
break;
case NODE_VORONOI_MANHATTAN:
vp = vp - p;
d = fabsf(vp.x) + fabsf(vp.y) + fabsf(vp.z);
break;
case NODE_VORONOI_CHEBYCHEV:
vp = vp - p;
d = fmaxf(fabsf(vp.x), fmaxf(fabsf(vp.y), fabsf(vp.z)));
break;
}
if(d < da) { if(d < da) {
da = d; da = d;
pa = vp; pa = vp;
sergeyUnsubmitted
Not Done
Inline Actions

It is guaranteed to be CPU here, meaning distance can become a functor, avoiding switch statement for each of the iterations.

sergey: It is guaranteed to be CPU here, meaning distance can become a functor, avoiding switch…
Context not available.
for(int zz = -1; zz <= 1; zz++) { for(int zz = -1; zz <= 1; zz++) {
ssef ip = ssef(xyzi + ssei(xx, yy, zz, 0)); ssef ip = ssef(xyzi + ssei(xx, yy, zz, 0));
ssef vp = ip + cellnoise_color(ip); ssef vp = ip + cellnoise_color(ip);
float d = len_squared<1, 1, 1, 0>(vec_p - vp); float d;
switch(distance_metric){
default:
d = len_squared<1, 1, 1, 0>(vec_p - vp);
break;
case NODE_VORONOI_DISTANCE:
d = sqrtf(len_squared<1, 1, 1, 0>(vec_p - vp));
break;
case NODE_VORONOI_MANHATTAN:
vp -= vec_p;
d = fabsf(vp[0]) + fabsf(vp[1]) + fabsf(vp[2]);
break;
case NODE_VORONOI_CHEBYCHEV:
vp -= vec_p;
d = fmaxf(fabsf(vp[0]), fmaxf(fabsf(vp[1]), fabsf(vp[2])));
break;
}
if(d < da) { if(d < da) {
da = d; da = d;
pa = vp; pa = vp;
Context not available.
#endif #endif
} }
ccl_device_noinline float4 svm_voronoi(NodeVoronoiColoring coloring, float3 p) ccl_device_noinline float4 svm_voronoi(NodeVoronoiColoring coloring, NodeVoronoiDistanceMetric distance_metric, float3 p, float *f2)
{ {
if(coloring == NODE_VORONOI_INTENSITY) { if(coloring == NODE_VORONOI_INTENSITY) {
/* compute squared distance to the nearest neighbour */ /* compute squared distance to the nearest neighbour and next nearest neighbour*/
float fac = voronoi_F1_distance(p); float2 fac = voronoi_F1_distance(p, distance_metric);
return make_float4(fac, fac, fac, fac); *f2 = fac.y;
return make_float4(fac.x, fac.x, fac.x, fac.x);
} }
else { else {
/* compute color of the nearest neighbour */ /* compute color of the nearest neighbour */
float3 color = voronoi_F1_color(p); float3 color = voronoi_F1_color(p, distance_metric);
*f2 = average(color);
return make_float4(color.x, color.y, color.z, average(color)); return make_float4(color.x, color.y, color.z, average(color));
} }
} }
ccl_device void svm_node_tex_voronoi(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset) ccl_device void svm_node_tex_voronoi(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
{ {
uint coloring = node.y; uint coloring, distance_metric;
uint scale_offset, co_offset, fac_offset, color_offset; uint scale_offset, co_offset, fac_offset, color_offset, f2_offset;
decode_node_uchar4(node.y, &coloring, &f2_offset, &distance_metric, NULL);
decode_node_uchar4(node.z, &scale_offset, &co_offset, &fac_offset, &color_offset); decode_node_uchar4(node.z, &scale_offset, &co_offset, &fac_offset, &color_offset);
float3 co = stack_load_float3(stack, co_offset); float3 co = stack_load_float3(stack, co_offset);
float scale = stack_load_float_default(stack, scale_offset, node.w); float scale = stack_load_float_default(stack, scale_offset, node.w);
float4 result = svm_voronoi((NodeVoronoiColoring)coloring, co*scale); float f2;
float4 result = svm_voronoi((NodeVoronoiColoring)coloring, (NodeVoronoiDistanceMetric)distance_metric, co*scale, &f2);
float3 color = make_float3(result.x, result.y, result.z); float3 color = make_float3(result.x, result.y, result.z);
float f = result.w; float f = result.w;
if(stack_valid(f2_offset)) stack_store_float(stack, f2_offset, f2);
if(stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f); if(stack_valid(fac_offset)) stack_store_float(stack, fac_offset, f);
if(stack_valid(color_offset)) stack_store_float3(stack, color_offset, color); if(stack_valid(color_offset)) stack_store_float3(stack, color_offset, color);
} }
Context not available.