diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-05-15 01:18:20 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-05-15 01:18:20 +0400 |
| commit | 11707119ded9616b5cb81e1be8eff56727cb4299 (patch) | |
| tree | 99843238e33030de20fca19ca6bb5c03bf413c50 /intern/cycles/kernel/kernel.cu | |
| parent | d70497cefc0921a70d3a6179af7df58bb55f974c (diff) | |
Cycles:
* Code cleanup, remove unused "resolution" variable from the DeviceTask class, was never used.
Diffstat (limited to 'intern/cycles/kernel/kernel.cu')
| -rw-r--r-- | intern/cycles/kernel/kernel.cu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel.cu b/intern/cycles/kernel/kernel.cu index fc7992c87f0..52e3fe01c0e 100644 --- a/intern/cycles/kernel/kernel.cu +++ b/intern/cycles/kernel/kernel.cu @@ -35,13 +35,13 @@ extern "C" __global__ void kernel_cuda_path_trace(float *buffer, uint *rng_state kernel_path_trace(NULL, buffer, rng_state, sample, x, y, offset, stride); } -extern "C" __global__ void kernel_cuda_tonemap(uchar4 *rgba, float *buffer, int sample, int resolution, int sx, int sy, int sw, int sh, int offset, int stride) +extern "C" __global__ void kernel_cuda_tonemap(uchar4 *rgba, float *buffer, 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_film_tonemap(NULL, rgba, buffer, sample, resolution, x, y, offset, stride); + kernel_film_tonemap(NULL, rgba, buffer, sample, x, y, offset, stride); } extern "C" __global__ void kernel_cuda_shader(uint4 *input, float4 *output, int type, int sx) |