diff options
Diffstat (limited to 'intern/cycles/kernel/filter/filter_features.h')
| -rw-r--r-- | intern/cycles/kernel/filter/filter_features.h | 168 |
1 files changed, 87 insertions, 81 deletions
diff --git a/intern/cycles/kernel/filter/filter_features.h b/intern/cycles/kernel/filter/filter_features.h index e1ea6487aa9..809ccfe8be6 100644 --- a/intern/cycles/kernel/filter/filter_features.h +++ b/intern/cycles/kernel/filter/filter_features.h @@ -14,22 +14,25 @@ * limitations under the License. */ - CCL_NAMESPACE_BEGIN +CCL_NAMESPACE_BEGIN #define ccl_get_feature(buffer, pass) (buffer)[(pass)*pass_stride] /* Loop over the pixels in the range [low.x, high.x) x [low.y, high.y).+ * pixel_buffer always points to the current pixel in the first pass. * Repeat the loop for every secondary frame if there are any. */ -#define FOR_PIXEL_WINDOW for(int frame = 0; frame < tile_info->num_frames; frame++) { \ - pixel.z = tile_info->frames[frame]; \ - pixel_buffer = buffer + (low.y - rect.y)*buffer_w + (low.x - rect.x) + frame*frame_stride; \ - for(pixel.y = low.y; pixel.y < high.y; pixel.y++) { \ - for(pixel.x = low.x; pixel.x < high.x; pixel.x++, pixel_buffer++) { +#define FOR_PIXEL_WINDOW \ + for (int frame = 0; frame < tile_info->num_frames; frame++) { \ + pixel.z = tile_info->frames[frame]; \ + pixel_buffer = buffer + (low.y - rect.y) * buffer_w + (low.x - rect.x) + \ + frame * frame_stride; \ + for (pixel.y = low.y; pixel.y < high.y; pixel.y++) { \ + for (pixel.x = low.x; pixel.x < high.x; pixel.x++, pixel_buffer++) { -#define END_FOR_PIXEL_WINDOW } \ - pixel_buffer += buffer_w - (high.x - low.x); \ - } \ - } +#define END_FOR_PIXEL_WINDOW \ + } \ + pixel_buffer += buffer_w - (high.x - low.x); \ + } \ + } ccl_device_inline void filter_get_features(int3 pixel, const ccl_global float *ccl_restrict buffer, @@ -38,24 +41,24 @@ ccl_device_inline void filter_get_features(int3 pixel, const float *ccl_restrict mean, int pass_stride) { - features[0] = pixel.x; - features[1] = pixel.y; - features[2] = fabsf(ccl_get_feature(buffer, 0)); - features[3] = ccl_get_feature(buffer, 1); - features[4] = ccl_get_feature(buffer, 2); - features[5] = ccl_get_feature(buffer, 3); - features[6] = ccl_get_feature(buffer, 4); - features[7] = ccl_get_feature(buffer, 5); - features[8] = ccl_get_feature(buffer, 6); - features[9] = ccl_get_feature(buffer, 7); - if(use_time) { - features[10] = pixel.z; - } - if(mean) { - for(int i = 0; i < (use_time? 11 : 10); i++) { - features[i] -= mean[i]; - } - } + features[0] = pixel.x; + features[1] = pixel.y; + features[2] = fabsf(ccl_get_feature(buffer, 0)); + features[3] = ccl_get_feature(buffer, 1); + features[4] = ccl_get_feature(buffer, 2); + features[5] = ccl_get_feature(buffer, 3); + features[6] = ccl_get_feature(buffer, 4); + features[7] = ccl_get_feature(buffer, 5); + features[8] = ccl_get_feature(buffer, 6); + features[9] = ccl_get_feature(buffer, 7); + if (use_time) { + features[10] = pixel.z; + } + if (mean) { + for (int i = 0; i < (use_time ? 11 : 10); i++) { + features[i] -= mean[i]; + } + } } ccl_device_inline void filter_get_feature_scales(int3 pixel, @@ -65,38 +68,39 @@ ccl_device_inline void filter_get_feature_scales(int3 pixel, const float *ccl_restrict mean, int pass_stride) { - scales[0] = fabsf(pixel.x - mean[0]); - scales[1] = fabsf(pixel.y - mean[1]); - scales[2] = fabsf(fabsf(ccl_get_feature(buffer, 0)) - mean[2]); - scales[3] = len_squared(make_float3(ccl_get_feature(buffer, 1) - mean[3], - ccl_get_feature(buffer, 2) - mean[4], - ccl_get_feature(buffer, 3) - mean[5])); - scales[4] = fabsf(ccl_get_feature(buffer, 4) - mean[6]); - scales[5] = len_squared(make_float3(ccl_get_feature(buffer, 5) - mean[7], - ccl_get_feature(buffer, 6) - mean[8], - ccl_get_feature(buffer, 7) - mean[9])); - if(use_time) { - scales[6] = fabsf(pixel.z - mean[10]); - } + scales[0] = fabsf(pixel.x - mean[0]); + scales[1] = fabsf(pixel.y - mean[1]); + scales[2] = fabsf(fabsf(ccl_get_feature(buffer, 0)) - mean[2]); + scales[3] = len_squared(make_float3(ccl_get_feature(buffer, 1) - mean[3], + ccl_get_feature(buffer, 2) - mean[4], + ccl_get_feature(buffer, 3) - mean[5])); + scales[4] = fabsf(ccl_get_feature(buffer, 4) - mean[6]); + scales[5] = len_squared(make_float3(ccl_get_feature(buffer, 5) - mean[7], + ccl_get_feature(buffer, 6) - mean[8], + ccl_get_feature(buffer, 7) - mean[9])); + if (use_time) { + scales[6] = fabsf(pixel.z - mean[10]); + } } ccl_device_inline void filter_calculate_scale(float *scale, bool use_time) { - scale[0] = 1.0f/max(scale[0], 0.01f); - scale[1] = 1.0f/max(scale[1], 0.01f); - scale[2] = 1.0f/max(scale[2], 0.01f); - if(use_time) { - scale[10] = 1.0f/max(scale[6], 0.01f); - } - scale[6] = 1.0f/max(scale[4], 0.01f); - scale[7] = scale[8] = scale[9] = 1.0f/max(sqrtf(scale[5]), 0.01f); - scale[3] = scale[4] = scale[5] = 1.0f/max(sqrtf(scale[3]), 0.01f); + scale[0] = 1.0f / max(scale[0], 0.01f); + scale[1] = 1.0f / max(scale[1], 0.01f); + scale[2] = 1.0f / max(scale[2], 0.01f); + if (use_time) { + scale[10] = 1.0f / max(scale[6], 0.01f); + } + scale[6] = 1.0f / max(scale[4], 0.01f); + scale[7] = scale[8] = scale[9] = 1.0f / max(sqrtf(scale[5]), 0.01f); + scale[3] = scale[4] = scale[5] = 1.0f / max(sqrtf(scale[3]), 0.01f); } ccl_device_inline float3 filter_get_color(const ccl_global float *ccl_restrict buffer, int pass_stride) { - return make_float3(ccl_get_feature(buffer, 8), ccl_get_feature(buffer, 9), ccl_get_feature(buffer, 10)); + return make_float3( + ccl_get_feature(buffer, 8), ccl_get_feature(buffer, 9), ccl_get_feature(buffer, 10)); } ccl_device_inline void design_row_add(float *design_row, @@ -107,42 +111,44 @@ ccl_device_inline void design_row_add(float *design_row, float feature, int transform_row_stride) { - for(int i = 0; i < rank; i++) { - design_row[1+i] += transform[(row*transform_row_stride + i)*stride]*feature; - } + for (int i = 0; i < rank; i++) { + design_row[1 + i] += transform[(row * transform_row_stride + i) * stride] * feature; + } } /* Fill the design row. */ -ccl_device_inline void filter_get_design_row_transform(int3 p_pixel, - const ccl_global float *ccl_restrict p_buffer, - int3 q_pixel, - const ccl_global float *ccl_restrict q_buffer, - int pass_stride, - int rank, - float *design_row, - const ccl_global float *ccl_restrict transform, - int stride, - bool use_time) +ccl_device_inline void filter_get_design_row_transform( + int3 p_pixel, + const ccl_global float *ccl_restrict p_buffer, + int3 q_pixel, + const ccl_global float *ccl_restrict q_buffer, + int pass_stride, + int rank, + float *design_row, + const ccl_global float *ccl_restrict transform, + int stride, + bool use_time) { - int num_features = use_time? 11 : 10; + int num_features = use_time ? 11 : 10; - design_row[0] = 1.0f; - math_vector_zero(design_row+1, rank); + design_row[0] = 1.0f; + math_vector_zero(design_row + 1, rank); -#define DESIGN_ROW_ADD(I, F) design_row_add(design_row, rank, transform, stride, I, F, num_features); - DESIGN_ROW_ADD(0, q_pixel.x - p_pixel.x); - DESIGN_ROW_ADD(1, q_pixel.y - p_pixel.y); - DESIGN_ROW_ADD(2, fabsf(ccl_get_feature(q_buffer, 0)) - fabsf(ccl_get_feature(p_buffer, 0))); - DESIGN_ROW_ADD(3, ccl_get_feature(q_buffer, 1) - ccl_get_feature(p_buffer, 1)); - DESIGN_ROW_ADD(4, ccl_get_feature(q_buffer, 2) - ccl_get_feature(p_buffer, 2)); - DESIGN_ROW_ADD(5, ccl_get_feature(q_buffer, 3) - ccl_get_feature(p_buffer, 3)); - DESIGN_ROW_ADD(6, ccl_get_feature(q_buffer, 4) - ccl_get_feature(p_buffer, 4)); - DESIGN_ROW_ADD(7, ccl_get_feature(q_buffer, 5) - ccl_get_feature(p_buffer, 5)); - DESIGN_ROW_ADD(8, ccl_get_feature(q_buffer, 6) - ccl_get_feature(p_buffer, 6)); - DESIGN_ROW_ADD(9, ccl_get_feature(q_buffer, 7) - ccl_get_feature(p_buffer, 7)); - if(use_time) { - DESIGN_ROW_ADD(10, q_pixel.z - p_pixel.z) - } +#define DESIGN_ROW_ADD(I, F) \ + design_row_add(design_row, rank, transform, stride, I, F, num_features); + DESIGN_ROW_ADD(0, q_pixel.x - p_pixel.x); + DESIGN_ROW_ADD(1, q_pixel.y - p_pixel.y); + DESIGN_ROW_ADD(2, fabsf(ccl_get_feature(q_buffer, 0)) - fabsf(ccl_get_feature(p_buffer, 0))); + DESIGN_ROW_ADD(3, ccl_get_feature(q_buffer, 1) - ccl_get_feature(p_buffer, 1)); + DESIGN_ROW_ADD(4, ccl_get_feature(q_buffer, 2) - ccl_get_feature(p_buffer, 2)); + DESIGN_ROW_ADD(5, ccl_get_feature(q_buffer, 3) - ccl_get_feature(p_buffer, 3)); + DESIGN_ROW_ADD(6, ccl_get_feature(q_buffer, 4) - ccl_get_feature(p_buffer, 4)); + DESIGN_ROW_ADD(7, ccl_get_feature(q_buffer, 5) - ccl_get_feature(p_buffer, 5)); + DESIGN_ROW_ADD(8, ccl_get_feature(q_buffer, 6) - ccl_get_feature(p_buffer, 6)); + DESIGN_ROW_ADD(9, ccl_get_feature(q_buffer, 7) - ccl_get_feature(p_buffer, 7)); + if (use_time) { + DESIGN_ROW_ADD(10, q_pixel.z - p_pixel.z) + } #undef DESIGN_ROW_ADD } |