diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-21 10:11:02 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-21 10:11:02 +0300 |
| commit | fab6c5040da8ed925650db1d68ecffe248ffdf57 (patch) | |
| tree | 2b0e83da43047cfb7997380af81a1920e48015fa /intern | |
| parent | ccd291aafbe5f0478963dc6e7f6b957a08eea511 (diff) | |
Fix: OpenCL Displacement and light sampling
The bake kernels are also used during mesh displacement and light
importance sampling. We disabled the implementation of these kernels
when baking was not enabled.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_background.cl | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernels/opencl/kernel_displace.cl | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernels/opencl/kernel_background.cl b/intern/cycles/kernel/kernels/opencl/kernel_background.cl index c7c709c0ad7..0e600676e82 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_background.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_background.cl @@ -30,10 +30,6 @@ __kernel void kernel_ocl_background( int x = sx + ccl_global_id(0); if(x < sx + sw) { -#ifdef __NO_BAKING__ - output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f); -#else kernel_background_evaluate(kg, input, output, x); -#endif } } diff --git a/intern/cycles/kernel/kernels/opencl/kernel_displace.cl b/intern/cycles/kernel/kernels/opencl/kernel_displace.cl index 288bfd5eadc..761badb751a 100644 --- a/intern/cycles/kernel/kernels/opencl/kernel_displace.cl +++ b/intern/cycles/kernel/kernels/opencl/kernel_displace.cl @@ -30,11 +30,7 @@ __kernel void kernel_ocl_displace( int x = sx + ccl_global_id(0); if(x < sx + sw) { -#ifdef __NO_BAKING__ - output[x] = make_float4(0.0f, 0.0f, 0.0f, 0.0f); -#else kernel_displace_evaluate(kg, input, output, x); -#endif } } |