diff options
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel.cl | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel.cu | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel.h | 6 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_film.h | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_sse2.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_sse3.cpp | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/intern/cycles/kernel/kernel.cl b/intern/cycles/kernel/kernel.cl index f98414d4f02..22cb806b8e0 100644 --- a/intern/cycles/kernel/kernel.cl +++ b/intern/cycles/kernel/kernel.cl @@ -62,7 +62,7 @@ __kernel void kernel_ocl_tonemap( __global type *name, #include "kernel_textures.h" - int sample, int resolution, + int sample, int sx, int sy, int sw, int sh, int offset, int stride) { KernelGlobals kglobals, *kg = &kglobals; @@ -77,7 +77,7 @@ __kernel void kernel_ocl_tonemap( int y = sy + get_global_id(1); if(x < sx + sw && y < sy + sh) - kernel_film_tonemap(kg, rgba, buffer, sample, resolution, x, y, offset, stride); + kernel_film_tonemap(kg, rgba, buffer, sample, x, y, offset, stride); } /*__kernel void kernel_ocl_shader(__global uint4 *input, __global float *output, int type, int sx) diff --git a/intern/cycles/kernel/kernel.cpp b/intern/cycles/kernel/kernel.cpp index d760e63a290..69bc5d8ebb1 100644 --- a/intern/cycles/kernel/kernel.cpp +++ b/intern/cycles/kernel/kernel.cpp @@ -95,9 +95,9 @@ void kernel_cpu_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_s /* Tonemapping */ -void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, int sample, int resolution, int x, int y, int offset, int stride) +void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, int sample, int x, int y, int offset, int stride) { - kernel_film_tonemap(kg, rgba, buffer, sample, resolution, x, y, offset, stride); + kernel_film_tonemap(kg, rgba, buffer, sample, x, y, offset, stride); } /* Shader Evaluation */ 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) diff --git a/intern/cycles/kernel/kernel.h b/intern/cycles/kernel/kernel.h index 20ea5a61906..a87cfa39550 100644 --- a/intern/cycles/kernel/kernel.h +++ b/intern/cycles/kernel/kernel.h @@ -39,7 +39,7 @@ void kernel_tex_copy(KernelGlobals *kg, const char *name, device_ptr mem, size_t void kernel_cpu_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride); void kernel_cpu_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, - int sample, int resolution, int x, int y, int offset, int stride); + int sample, int x, int y, int offset, int stride); void kernel_cpu_shader(KernelGlobals *kg, uint4 *input, float4 *output, int type, int i); @@ -47,14 +47,14 @@ void kernel_cpu_shader(KernelGlobals *kg, uint4 *input, float4 *output, void kernel_cpu_sse2_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride); void kernel_cpu_sse2_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, - int sample, int resolution, int x, int y, int offset, int stride); + int sample, int x, int y, int offset, int stride); void kernel_cpu_sse2_shader(KernelGlobals *kg, uint4 *input, float4 *output, int type, int i); void kernel_cpu_sse3_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state, int sample, int x, int y, int offset, int stride); void kernel_cpu_sse3_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, - int sample, int resolution, int x, int y, int offset, int stride); + int sample, int x, int y, int offset, int stride); void kernel_cpu_sse3_shader(KernelGlobals *kg, uint4 *input, float4 *output, int type, int i); #endif diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h index 232049fb6cb..293b557a38e 100644 --- a/intern/cycles/kernel/kernel_film.h +++ b/intern/cycles/kernel/kernel_film.h @@ -50,7 +50,7 @@ __device uchar4 film_float_to_byte(float4 color) __device void kernel_film_tonemap(KernelGlobals *kg, __global uchar4 *rgba, __global float *buffer, - int sample, int resolution, int x, int y, int offset, int stride) + int sample, int x, int y, int offset, int stride) { /* buffer offset */ int index = offset + x + y*stride; diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index e9d482ae5cf..b58e41f954f 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -42,9 +42,9 @@ void kernel_cpu_sse2_path_trace(KernelGlobals *kg, float *buffer, unsigned int * /* Tonemapping */ -void kernel_cpu_sse2_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, int sample, int resolution, int x, int y, int offset, int stride) +void kernel_cpu_sse2_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, int sample, int x, int y, int offset, int stride) { - kernel_film_tonemap(kg, rgba, buffer, sample, resolution, x, y, offset, stride); + kernel_film_tonemap(kg, rgba, buffer, sample, x, y, offset, stride); } /* Shader Evaluate */ diff --git a/intern/cycles/kernel/kernel_sse3.cpp b/intern/cycles/kernel/kernel_sse3.cpp index 9a8b389cf68..6982570c59b 100644 --- a/intern/cycles/kernel/kernel_sse3.cpp +++ b/intern/cycles/kernel/kernel_sse3.cpp @@ -42,9 +42,9 @@ void kernel_cpu_sse3_path_trace(KernelGlobals *kg, float *buffer, unsigned int * /* Tonemapping */ -void kernel_cpu_sse3_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, int sample, int resolution, int x, int y, int offset, int stride) +void kernel_cpu_sse3_tonemap(KernelGlobals *kg, uchar4 *rgba, float *buffer, int sample, int x, int y, int offset, int stride) { - kernel_film_tonemap(kg, rgba, buffer, sample, resolution, x, y, offset, stride); + kernel_film_tonemap(kg, rgba, buffer, sample, x, y, offset, stride); } /* Shader Evaluate */ |