Commit: 66e8c720a379e7c0685143e677f3a1bacd7adfd7
Author: Lukas Stockner
Date: Thu Aug 4 17:55:56 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB66e8c720a379e7c0685143e677f3a1bacd7adfd7
Cycles: Fix wrong array indexing in the feature kernel
===================================================================
M intern/cycles/kernel/kernel_filter.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_filter.h
b/intern/cycles/kernel/kernel_filter.h
index 1c34639..c2f5b54 100644
--- a/intern/cycles/kernel/kernel_filter.h
+++ b/intern/cycles/kernel/kernel_filter.h
@@ -40,10 +40,10 @@ ccl_device_inline void filter_get_features(int x, int y,
float *buffer, float *p
features[3] = pre_buffer[ 2*pre_stride];
features[4] = pre_buffer[ 4*pre_stride];
features[5] = pre_buffer[12*pre_stride];
- features[5] = pre_buffer[14*pre_stride];
- features[6] = pre_buffer[ 6*pre_stride];
- features[7] = pre_buffer[ 8*pre_stride];
- features[8] = pre_buffer[10*pre_stride];
+ features[6] = pre_buffer[14*pre_stride];
+ features[7] = pre_buffer[ 6*pre_stride];
+ features[8] = pre_buffer[ 8*pre_stride];
+ features[9] = pre_buffer[10*pre_stride];
/* features[2] = buffer[12] * sample_scale;
features[3] = buffer[0] * sample_scale;
features[4] = buffer[1] * sample_scale;
@@ -71,10 +71,10 @@ ccl_device_inline void filter_get_feature_variance(int x,
int y, float *buffer,
features[3] = pre_buffer[ 3*pre_stride];
features[4] = pre_buffer[ 5*pre_stride];
features[5] = pre_buffer[13*pre_stride];
- features[5] = pre_buffer[15*pre_stride];
- features[6] = pre_buffer[ 7*pre_stride];
- features[7] = pre_buffer[ 9*pre_stride];
- features[8] = pre_buffer[11*pre_stride];
+ features[6] = pre_buffer[15*pre_stride];
+ features[7] = pre_buffer[ 7*pre_stride];
+ features[8] = pre_buffer[ 9*pre_stride];
+ features[9] = pre_buffer[11*pre_stride];
/* features[2] = saturate(buffer[13] * sample_scale_var) * sample_scale;
features[3] = saturate(buffer[3] * sample_scale_var) * sample_scale;
features[4] = saturate(buffer[4] * sample_scale_var) * sample_scale;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
