From 11707119ded9616b5cb81e1be8eff56727cb4299 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 14 May 2013 21:18:20 +0000 Subject: Cycles: * Code cleanup, remove unused "resolution" variable from the DeviceTask class, was never used. --- intern/cycles/kernel/kernel.cu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/kernel/kernel.cu') 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) -- cgit v1.2.3