Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Cycles denoising NaNs with a 1 sample renders.

Browse Source 
This was causing different render results with different compilers. We
can't do much useful with 1 sample, but better for debugging.
This commit is contained in:
Brecht Van Lommel
2017-07-21 21:43:49 +02:00
parent b4528d8897
commit ec831ee7d1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/kernel/filter/filter_prefilter.h
View File

@@ -61,8 +61,8 @@ ccl_device void kernel_filter_divide_shadow(int sample,
varA = max(0.0f, varA - unfilteredA[idx]*unfilteredA[idx]*odd_sample); varA = max(0.0f, varA - unfilteredA[idx]*unfilteredA[idx]*odd_sample);
varB = max(0.0f, varB - unfilteredB[idx]*unfilteredB[idx]*even_sample); varB = max(0.0f, varB - unfilteredB[idx]*unfilteredB[idx]*even_sample);
} }
varA /= (odd_sample - 1); varA /= max(odd_sample - 1, 1);
varB /= (even_sample - 1); varB /= max(even_sample - 1, 1);
sampleVariance[idx] = 0.5f*(varA + varB) / sample; sampleVariance[idx] = 0.5f*(varA + varB) / sample;
sampleVarianceV[idx] = 0.5f * (varA - varB) * (varA - varB) / (sample*sample); sampleVarianceV[idx] = 0.5f * (varA - varB) * (varA - varB) / (sample*sample);
@@ -96,12 +96,18 @@ ccl_device void kernel_filter_get_feature(int sample,
int idx = (y-rect.y)*buffer_w + (x - rect.x); int idx = (y-rect.y)*buffer_w + (x - rect.x);
mean[idx] = center_buffer[m_offset] / sample; mean[idx] = center_buffer[m_offset] / sample;
if (sample > 1) {
if(use_split_variance) { if(use_split_variance) {
variance[idx] = max(0.0f, (center_buffer[v_offset] - mean[idx]*mean[idx]*sample) / (sample * (sample-1))); variance[idx] = max(0.0f, (center_buffer[v_offset] - mean[idx]*mean[idx]*sample) / (sample * (sample-1)));
} }
else { else {
variance[idx] = center_buffer[v_offset] / (sample * (sample-1)); variance[idx] = center_buffer[v_offset] / (sample * (sample-1));
} }
}
else {
/* Can't compute variance with single sample, just set it very high. */
variance[idx] = 1e10f;
}
} }
ccl_device void kernel_filter_detect_outliers(int x, int y, ccl_device void kernel_filter_detect_outliers(int x, int y,