diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-11 13:12:38 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-11 13:25:37 +0300 |
commit | e5a1a9288c66ce218a03abf7666336a39ba03b8f (patch) | |
tree | 76a948f322556c1f48ecfe49413ddb4535512aaa /intern/cycles | |
parent | b1e286bbfe9b8632a93ba40a7a40c77652479b7c (diff) |
Fix T60320: Cycles OpenCL denoising filter errors on some drivers.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/filter/filter_nlm_gpu.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/kernel/filter/filter_nlm_gpu.h b/intern/cycles/kernel/filter/filter_nlm_gpu.h index 4ca49ea6733..cffd61cb7d1 100644 --- a/intern/cycles/kernel/filter/filter_nlm_gpu.h +++ b/intern/cycles/kernel/filter/filter_nlm_gpu.h @@ -36,8 +36,6 @@ ccl_device_inline bool get_nlm_coords_window(int w, int h, int r, int stride, if(sy >= s) { return false; } - co->z = sx-r; - co->w = sy-r; /* Pixels still need to lie inside the denoising buffer after applying the offset, * so determine the area for which this is the case. */ @@ -59,8 +57,8 @@ ccl_device_inline bool get_nlm_coords_window(int w, int h, int r, int stride, if(!local_index_to_coord(clip_area, ccl_global_id(0), &x, &y)) { return false; } - co->x = x; - co->y = y; + + *co = make_int4(x, y, sx - r, sy - r); *ofs = (sy*s + sx) * stride; |