Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-05-15 01:18:20 +0400
committerThomas Dinges <blender@dingto.org>2013-05-15 01:18:20 +0400
commit11707119ded9616b5cb81e1be8eff56727cb4299 (patch)
tree99843238e33030de20fca19ca6bb5c03bf413c50 /intern/cycles/kernel/kernel.h
parentd70497cefc0921a70d3a6179af7df58bb55f974c (diff)
Cycles:
* Code cleanup, remove unused "resolution" variable from the DeviceTask class, was never used.
Diffstat (limited to 'intern/cycles/kernel/kernel.h')
-rw-r--r--intern/cycles/kernel/kernel.h6
1 files changed, 3 insertions, 3 deletions
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