diff options
Diffstat (limited to 'intern/cycles/kernel/filter/filter_features.h')
| -rw-r--r-- | intern/cycles/kernel/filter/filter_features.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/filter/filter_features.h b/intern/cycles/kernel/filter/filter_features.h index f5a40d49997..41998c792b6 100644 --- a/intern/cycles/kernel/filter/filter_features.h +++ b/intern/cycles/kernel/filter/filter_features.h @@ -16,7 +16,7 @@ CCL_NAMESPACE_BEGIN -#define ccl_get_feature(buffer, pass) buffer[(pass)*pass_stride] +#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. */ @@ -32,7 +32,7 @@ ccl_device_inline void filter_get_features(int2 pixel, ccl_global float ccl_rest { features[0] = pixel.x; features[1] = pixel.y; - features[2] = ccl_get_feature(buffer, 0); + 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); @@ -50,7 +50,7 @@ ccl_device_inline void filter_get_feature_scales(int2 pixel, ccl_global float cc { scales[0] = fabsf(pixel.x - mean[0]); scales[1] = fabsf(pixel.y - mean[1]); - scales[2] = fabsf(ccl_get_feature(buffer, 0) - mean[2]); + 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])); @@ -107,7 +107,7 @@ ccl_device_inline void filter_get_design_row_transform(int2 p_pixel, math_vector_zero(design_row+1, rank); design_row_add(design_row, rank, transform, stride, 0, q_pixel.x - p_pixel.x); design_row_add(design_row, rank, transform, stride, 1, q_pixel.y - p_pixel.y); - design_row_add(design_row, rank, transform, stride, 2, ccl_get_feature(q_buffer, 0) - ccl_get_feature(p_buffer, 0)); + design_row_add(design_row, rank, transform, stride, 2, fabsf(ccl_get_feature(q_buffer, 0)) - fabsf(ccl_get_feature(p_buffer, 0))); design_row_add(design_row, rank, transform, stride, 3, ccl_get_feature(q_buffer, 1) - ccl_get_feature(p_buffer, 1)); design_row_add(design_row, rank, transform, stride, 4, ccl_get_feature(q_buffer, 2) - ccl_get_feature(p_buffer, 2)); design_row_add(design_row, rank, transform, stride, 5, ccl_get_feature(q_buffer, 3) - ccl_get_feature(p_buffer, 3)); |