diff options
| author | Lukas Stockner <lukasstockner97> | 2021-01-11 22:42:47 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2021-01-11 23:04:49 +0300 |
| commit | 688e5c6d3895a8f6b5aec06977c9dcb4b00e0a76 (patch) | |
| tree | 85fcba0cb6f02e427c97e7af77616925970f8544 /intern/cycles/kernel | |
| parent | b70f4a265a22ceb2c31dd54002a318d0f949e294 (diff) | |
Fix T82351: Cycles: Tile stealing glitches with adaptive sampling
In my testing this works, but it requires me to remove the min(start_sample...) part in the
adaptive sampling kernel, and I assume there's a reason why it was there?
Reviewed By: brecht
Maniphest Tasks: T82351
Differential Revision: https://developer.blender.org/D9445
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/kernels/cuda/kernel.cu | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/split/kernel_adaptive_adjust_samples.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernels/cuda/kernel.cu b/intern/cycles/kernel/kernels/cuda/kernel.cu index d4f41132a11..cf62b6e781e 100644 --- a/intern/cycles/kernel/kernels/cuda/kernel.cu +++ b/intern/cycles/kernel/kernels/cuda/kernel.cu @@ -139,7 +139,7 @@ kernel_cuda_adaptive_scale_samples(WorkTile *tile, int start_sample, int sample, ccl_global float *buffer = tile->buffer + index * kernel_data.film.pass_stride; if(buffer[kernel_data.film.pass_sample_count] < 0.0f) { buffer[kernel_data.film.pass_sample_count] = -buffer[kernel_data.film.pass_sample_count]; - float sample_multiplier = sample / max((float)start_sample + 1.0f, buffer[kernel_data.film.pass_sample_count]); + float sample_multiplier = sample / buffer[kernel_data.film.pass_sample_count]; if(sample_multiplier != 1.0f) { kernel_adaptive_post_adjust(&kg, buffer, sample_multiplier); } diff --git a/intern/cycles/kernel/split/kernel_adaptive_adjust_samples.h b/intern/cycles/kernel/split/kernel_adaptive_adjust_samples.h index 60ebf415970..437a5c9581b 100644 --- a/intern/cycles/kernel/split/kernel_adaptive_adjust_samples.h +++ b/intern/cycles/kernel/split/kernel_adaptive_adjust_samples.h @@ -29,8 +29,7 @@ ccl_device void kernel_adaptive_adjust_samples(KernelGlobals *kg) int sample = kernel_split_params.tile.start_sample + kernel_split_params.tile.num_samples; if (buffer[kernel_data.film.pass_sample_count] < 0.0f) { buffer[kernel_data.film.pass_sample_count] = -buffer[kernel_data.film.pass_sample_count]; - float sample_multiplier = sample / max((float)kernel_split_params.tile.start_sample + 1.0f, - buffer[kernel_data.film.pass_sample_count]); + float sample_multiplier = sample / buffer[kernel_data.film.pass_sample_count]; if (sample_multiplier != 1.0f) { kernel_adaptive_post_adjust(kg, buffer, sample_multiplier); } |