diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-05-25 17:48:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-05-25 18:06:10 +0300 |
commit | 9f1f7ba2bbee2bf82b09e63fde4d8a187265f49a (patch) | |
tree | 421afba00c845491fd5365084ead65cfaf4770ff /intern/cycles/kernel/kernel_adaptive_sampling.h | |
parent | f53ae843b38e049b49ff2df0ab7477ad2180488d (diff) |
Fix T76925: more Cycles OpenCL compile errors with some drivers on Linux
Diffstat (limited to 'intern/cycles/kernel/kernel_adaptive_sampling.h')
-rw-r--r-- | intern/cycles/kernel/kernel_adaptive_sampling.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/kernel_adaptive_sampling.h b/intern/cycles/kernel/kernel_adaptive_sampling.h index ee4d1507ef1..98b7bf7e7dc 100644 --- a/intern/cycles/kernel/kernel_adaptive_sampling.h +++ b/intern/cycles/kernel/kernel_adaptive_sampling.h @@ -185,19 +185,19 @@ ccl_device bool kernel_do_adaptive_filter_x(KernelGlobals *kg, int y, ccl_global ccl_global float *buffer = tile->buffer + index * kernel_data.film.pass_stride; ccl_global float4 *aux = (ccl_global float4 *)(buffer + kernel_data.film.pass_adaptive_aux_buffer); - if (aux->w == 0.0f) { + if ((*aux).w == 0.0f) { any = true; if (x > tile->x && !prev) { index = index - 1; buffer = tile->buffer + index * kernel_data.film.pass_stride; aux = (ccl_global float4 *)(buffer + kernel_data.film.pass_adaptive_aux_buffer); - aux->w = 0.0f; + (*aux).w = 0.0f; } prev = true; } else { if (prev) { - aux->w = 0.0f; + (*aux).w = 0.0f; } prev = false; } @@ -214,19 +214,19 @@ ccl_device bool kernel_do_adaptive_filter_y(KernelGlobals *kg, int x, ccl_global ccl_global float *buffer = tile->buffer + index * kernel_data.film.pass_stride; ccl_global float4 *aux = (ccl_global float4 *)(buffer + kernel_data.film.pass_adaptive_aux_buffer); - if (aux->w == 0.0f) { + if ((*aux).w == 0.0f) { any = true; if (y > tile->y && !prev) { index = index - tile->stride; buffer = tile->buffer + index * kernel_data.film.pass_stride; aux = (ccl_global float4 *)(buffer + kernel_data.film.pass_adaptive_aux_buffer); - aux->w = 0.0f; + (*aux).w = 0.0f; } prev = true; } else { if (prev) { - aux->w = 0.0f; + (*aux).w = 0.0f; } prev = false; } |