Cycles:

* Code cleanup, remove unused "resolution" variable from the DeviceTask class, was never used. 

6 files changed, 6 insertions, 12 deletions

diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 47f3273fdfa..95df2e21608 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -246,13 +246,13 @@ public:
 			for(int y = task.y; y < task.y + task.h; y++)
 				for(int x = task.x; x < task.x + task.w; x++)
 					kernel_cpu_sse3_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
-						task.sample, task.resolution, x, y, task.offset, task.stride);
+						task.sample, x, y, task.offset, task.stride);
 		}
 		else if(system_cpu_support_sse2()) {
 			for(int y = task.y; y < task.y + task.h; y++)
 				for(int x = task.x; x < task.x + task.w; x++)
 					kernel_cpu_sse2_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
-						task.sample, task.resolution, x, y, task.offset, task.stride);
+						task.sample, x, y, task.offset, task.stride);
 		}
 		else
 #endif
@@ -260,7 +260,7 @@ public:
 			for(int y = task.y; y < task.y + task.h; y++)
 				for(int x = task.x; x < task.x + task.w; x++)
 					kernel_cpu_tonemap(&kernel_globals, (uchar4*)task.rgba, (float*)task.buffer,
-						task.sample, task.resolution, x, y, task.offset, task.stride);
+						task.sample, x, y, task.offset, task.stride);
 		}
 	}
 
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index ec7440c972c..f32c6dde639 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -611,9 +611,6 @@ public:
 		cuda_assert(cuParamSeti(cuFilmConvert, offset, task.sample))
 		offset += sizeof(task.sample);
 
-		cuda_assert(cuParamSeti(cuFilmConvert, offset, task.resolution))
-		offset += sizeof(task.resolution);
-
 		cuda_assert(cuParamSeti(cuFilmConvert, offset, task.x))
 		offset += sizeof(task.x);
 
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h
index b74329888d3..10b8dadc35d 100644
--- a/intern/cycles/device/device_network.h
+++ b/intern/cycles/device/device_network.h
@@ -97,7 +97,7 @@ public:
 
 		archive & type & task.x & task.y & task.w & task.h;
 		archive & task.rgba & task.buffer & task.sample & task.num_samples;
-		archive & task.resolution & task.offset & task.stride;
+		archive & task.offset & task.stride;
 		archive & task.shader_input & task.shader_output & task.shader_eval_type;
 		archive & task.shader_x & task.shader_w;
 	}
@@ -106,7 +106,7 @@ public:
 	{
 		archive & tile.x & tile.y & tile.w & tile.h;
 		archive & tile.start_sample & tile.num_samples & tile.sample;
-		archive & tile.resolution & tile.offset & tile.stride;
+		archive & tile.offset & tile.stride;
 		archive & tile.buffer & tile.rng_state & tile.rgba;
 	}
 
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 73d6ae47190..4608c06c3d5 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -651,7 +651,6 @@ public:
 		cl_int d_w = task.w;
 		cl_int d_h = task.h;
 		cl_int d_sample = task.sample;
-		cl_int d_resolution = task.resolution;
 		cl_int d_offset = task.offset;
 		cl_int d_stride = task.stride;
 
@@ -668,7 +667,6 @@ public:
 #include "kernel_textures.h"
 
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_sample), (void*)&d_sample);
-		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_resolution), (void*)&d_resolution);
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_x), (void*)&d_x);
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_y), (void*)&d_y);
 		ciErr |= clSetKernelArg(ckFilmConvertKernel, narg++, sizeof(d_w), (void*)&d_w);
diff --git a/intern/cycles/device/device_task.cpp b/intern/cycles/device/device_task.cpp
index b3f02deaf6f..ad5ff841963 100644
--- a/intern/cycles/device/device_task.cpp
+++ b/intern/cycles/device/device_task.cpp
@@ -30,7 +30,7 @@ CCL_NAMESPACE_BEGIN
 
 DeviceTask::DeviceTask(Type type_)
 : type(type_), x(0), y(0), w(0), h(0), rgba(0), buffer(0),
-  sample(0), num_samples(1), resolution(0),
+  sample(0), num_samples(1),
   shader_input(0), shader_output(0),
   shader_eval_type(0), shader_x(0), shader_w(0)
 {
diff --git a/intern/cycles/device/device_task.h b/intern/cycles/device/device_task.h
index 8ca8b88ea49..cfeb2860d41 100644
--- a/intern/cycles/device/device_task.h
+++ b/intern/cycles/device/device_task.h
@@ -44,7 +44,6 @@ public:
 	device_ptr buffer;
 	int sample;
 	int num_samples;
-	int resolution;
 	int offset, stride;
 
 	device_ptr shader_input;