[Bf-blender-cvs] [ffd83a34ab5] master: Fix T51502: Cycles denoising not using correctly aligned width for NLM on CUDA

Lukas Stockner noreply at git.blender.org
Fri May 19 02:12:57 CEST 2017


Commit: ffd83a34ab53f40a2ff0a67f893e120e94a04b25
Author: Lukas Stockner
Date:   Fri May 19 02:02:36 2017 +0200
Branches: master
https://developer.blender.org/rBffd83a34ab53f40a2ff0a67f893e120e94a04b25

Fix T51502: Cycles denoising not using correctly aligned width for NLM on CUDA

===================================================================

M	intern/cycles/device/device_cuda.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 4d8ca487799..90647c344e3 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -949,7 +949,7 @@ public:
 		cuda_push_context();
 
 		int4 rect = task->rect;
-		int w = rect.z-rect.x;
+		int w = align_up(rect.z-rect.x, 4);
 		int h = rect.w-rect.y;
 		int r = task->nlm_state.r;
 		int f = task->nlm_state.f;




More information about the Bf-blender-cvs mailing list