diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-11 17:09:46 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-01-11 17:09:46 +0300 |
commit | cca35c10135290f1a7e298d51964eef2c6c67ce0 (patch) | |
tree | c2c96c0e58b46ba38b53142f8d4330ea829a9c01 /intern/cycles/kernel | |
parent | 5793a84f1262ce78398320f8518816ff7e62cdd8 (diff) | |
parent | c1dd74580ed8352b9f6c96d816a604ebb4f3c39d (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/kernel')
-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; |