diff options
Diffstat (limited to 'intern/cycles/kernel/kernel.cu')
| -rw-r--r-- | intern/cycles/kernel/kernel.cu | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel.cu b/intern/cycles/kernel/kernel.cu index cefc30fc393..c4da1d440b7 100644 --- a/intern/cycles/kernel/kernel.cu +++ b/intern/cycles/kernel/kernel.cu @@ -24,23 +24,23 @@ #include "kernel_path.h" #include "kernel_displace.h" -extern "C" __global__ void kernel_cuda_path_trace_progressive(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride) +extern "C" __global__ void kernel_cuda_path_trace(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride) { int x = sx + blockDim.x*blockIdx.x + threadIdx.x; int y = sy + blockDim.y*blockIdx.y + threadIdx.y; if(x < sx + sw && y < sy + sh) - kernel_path_trace_progressive(NULL, buffer, rng_state, sample, x, y, offset, stride); + kernel_path_trace(NULL, buffer, rng_state, sample, x, y, offset, stride); } -#ifdef __NON_PROGRESSIVE__ -extern "C" __global__ void kernel_cuda_path_trace_non_progressive(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride) +#ifdef __BRANCHED_PATH__ +extern "C" __global__ void kernel_cuda_branched_path_trace(float *buffer, uint *rng_state, int sample, int sx, int sy, int sw, int sh, int offset, int stride) { int x = sx + blockDim.x*blockIdx.x + threadIdx.x; int y = sy + blockDim.y*blockIdx.y + threadIdx.y; if(x < sx + sw && y < sy + sh) - kernel_path_trace_non_progressive(NULL, buffer, rng_state, sample, x, y, offset, stride); + kernel_branched_path_trace(NULL, buffer, rng_state, sample, x, y, offset, stride); } #endif |