From 7920ebd1573a45d3c3f71cde7f748828b46bb91f Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Tue, 9 Oct 2018 00:03:47 +0200 Subject: Cycles: Fix NLM denoising kernels zeroing the wrong buffer on OpenCL Since my temporary buffer commit (about a month ago), the OpenCL device was zeroing the wrong buffer, leading to completely wrong filtered feature passes and therefore significantly lower-quality results than CPU and CUDA. --- intern/cycles/device/opencl/opencl_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern') diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp index ffd3b7d7625..1e73d37d7a4 100644 --- a/intern/cycles/device/opencl/opencl_base.cpp +++ b/intern/cycles/device/opencl/opencl_base.cpp @@ -761,7 +761,7 @@ bool OpenCLDeviceBase::denoising_non_local_means(device_ptr image_ptr, cl_mem variance_mem = CL_MEM_PTR(variance_ptr); cl_mem out_mem = CL_MEM_PTR(out_ptr); - mem_zero_kernel(*difference, sizeof(float)*pass_stride); + mem_zero_kernel(*weightAccum, sizeof(float)*pass_stride); mem_zero_kernel(out_ptr, sizeof(float)*pass_stride); cl_kernel ckNLMCalcDifference = denoising_program(ustring("filter_nlm_calc_difference")); -- cgit v1.2.3 From 76f640c27d896e174d3581acfd3a718772d18f11 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 9 Oct 2018 09:28:36 +1100 Subject: Cleanup: spelling --- intern/ghost/intern/GHOST_WindowWin32.cpp | 4 ++-- intern/ghost/intern/GHOST_WindowWin32.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'intern') diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 00096c05ee3..983fffc10e6 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -1110,12 +1110,12 @@ GHOST_TSuccess GHOST_WindowWin32::endProgressBar() #ifdef WITH_INPUT_IME void GHOST_WindowWin32::beginIME(GHOST_TInt32 x, GHOST_TInt32 y, GHOST_TInt32 w, GHOST_TInt32 h, int completed) { - m_imeImput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), (bool)completed); + m_imeInput.BeginIME(m_hWnd, GHOST_Rect(x, y - h, x, y), (bool)completed); } void GHOST_WindowWin32::endIME() { - m_imeImput.EndIME(m_hWnd); + m_imeInput.EndIME(m_hWnd); } #endif /* WITH_INPUT_IME */ diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index c72669ed898..9907385154a 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -265,7 +265,7 @@ public: bool m_inLiveResize; #ifdef WITH_INPUT_IME - GHOST_ImeWin32 *getImeInput() {return &m_imeImput;} + GHOST_ImeWin32 *getImeInput() {return &m_imeInput;} void beginIME( GHOST_TInt32 x, GHOST_TInt32 y, @@ -369,7 +369,7 @@ private: #ifdef WITH_INPUT_IME /** Handle input method editors event */ - GHOST_ImeWin32 m_imeImput; + GHOST_ImeWin32 m_imeInput; #endif bool m_debug_context; }; -- cgit v1.2.3