Cycles: Code cleanup, prepare for strict C++ flags

4 files changed, 29 insertions, 18 deletions

diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 7c17f7f4112..18fc707beab 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -106,9 +106,15 @@ public:
 	virtual void const_copy_to(const char *name, void *host, size_t size) = 0;
 
 	/* texture memory */
-	virtual void tex_alloc(const char *name, device_memory& mem,
-		InterpolationType interpolation = INTERPOLATION_NONE, bool periodic = false) {};
-	virtual void tex_free(device_memory& mem) {};
+	virtual void tex_alloc(const char * /*name*/,
+	                       device_memory& /*mem*/,
+	                       InterpolationType interpolation = INTERPOLATION_NONE,
+	                       bool periodic = false)
+	{
+		(void)interpolation;  /* Ignored. */
+		(void)periodic;  /* Ignored. */
+	};
+	virtual void tex_free(device_memory& /*mem*/) {};
 
 	/* pixel memory */
 	virtual void pixels_alloc(device_memory& mem);
@@ -119,7 +125,7 @@ public:
 	virtual void *osl_memory() { return NULL; }
 
 	/* load/compile kernels, must be called before adding tasks */ 
-	virtual bool load_kernels(bool experimental) { return true; }
+	virtual bool load_kernels(bool /*experimental*/) { return true; }
 
 	/* tasks */
 	virtual int get_split_task_count(DeviceTask& task) = 0;
@@ -138,8 +144,8 @@ public:
 #endif
 
 	/* multi device */
-	virtual void map_tile(Device *sub_device, RenderTile& tile) {}
-	virtual int device_number(Device *sub_device) { return 0; }
+	virtual void map_tile(Device * /*sub_device*/, RenderTile& /*tile*/) {}
+	virtual int device_number(Device * /*sub_device*/) { return 0; }
 
 	/* static */
 	static Device *create(DeviceInfo& info, Stats &stats, bool background = true);
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp
index 9abcf9167d5..70277c5aa48 100644
--- a/intern/cycles/device/device_cpu.cpp
+++ b/intern/cycles/device/device_cpu.cpp
@@ -75,19 +75,21 @@ public:
 		task_pool.stop();
 	}
 
-	void mem_alloc(device_memory& mem, MemoryType type)
+	void mem_alloc(device_memory& mem, MemoryType /*type*/)
 	{
 		mem.device_pointer = mem.data_pointer;
 		mem.device_size = mem.memory_size();
 		stats.mem_alloc(mem.device_size);
 	}
 
-	void mem_copy_to(device_memory& mem)
+	void mem_copy_to(device_memory& /*mem*/)
 	{
 		/* no-op */
 	}
 
-	void mem_copy_from(device_memory& mem, int y, int w, int h, int elem)
+	void mem_copy_from(device_memory& /*mem*/,
+	                   int /*y*/, int /*w*/, int /*h*/,
+	                   int /*elem*/)
 	{
 		/* no-op */
 	}
@@ -111,7 +113,7 @@ public:
 		kernel_const_copy(&kernel_globals, name, host, size);
 	}
 
-	void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool periodic)
+	void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool /*periodic*/)
 	{
 		kernel_tex_copy(&kernel_globals, name, mem.data_pointer, mem.data_width, mem.data_height, mem.data_depth, interpolation);
 		mem.device_pointer = mem.data_pointer;
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 79a1a2b7fe1..407f72034b3 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -185,7 +185,7 @@ public:
 		cuda_assert(cuCtxDestroy(cuContext));
 	}
 
-	bool support_device(bool experimental)
+	bool support_device(bool /*experimental*/)
 	{
 		int major, minor;
 		cuDeviceComputeCapability(&major, &minor, cuDevId);
@@ -344,7 +344,7 @@ public:
 		return (result == CUDA_SUCCESS);
 	}
 
-	void mem_alloc(device_memory& mem, MemoryType type)
+	void mem_alloc(device_memory& mem, MemoryType /*type*/)
 	{
 		cuda_push_context();
 		CUdeviceptr device_pointer;
@@ -999,7 +999,7 @@ public:
 		}
 	};
 
-	int get_split_task_count(DeviceTask& task)
+	int get_split_task_count(DeviceTask& /*task*/)
 	{
 		return 1;
 	}
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index a5bf35a63c8..f11c94245d5 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -505,7 +505,7 @@ public:
 	}
 
 	static void CL_CALLBACK context_notify_callback(const char *err_info,
-		const void *private_info, size_t cb, void *user_data)
+		const void * /*private_info*/, size_t /*cb*/, void *user_data)
 	{
 		char name[256];
 		clGetDeviceInfo((cl_device_id)user_data, CL_DEVICE_NAME, sizeof(name), &name, NULL);
@@ -596,7 +596,7 @@ public:
 		return true;
 	}
 
-	bool build_kernel(const string& kernel_path, const string *debug_src = NULL)
+	bool build_kernel(const string& /*kernel_path*/, const string *debug_src = NULL)
 	{
 		string build_options = opencl_kernel_build_options(platform_name, debug_src);
 	
@@ -675,7 +675,7 @@ public:
 		return md5.get_hex();
 	}
 
-	bool load_kernels(bool experimental)
+	bool load_kernels(bool /*experimental*/)
 	{
 		/* verify if device was initialized */
 		if(!device_initialized) {
@@ -854,7 +854,10 @@ public:
 		mem_copy_to(*i->second);
 	}
 
-	void tex_alloc(const char *name, device_memory& mem, InterpolationType interpolation, bool periodic)
+	void tex_alloc(const char *name,
+	               device_memory& mem,
+	               InterpolationType /*interpolation*/,
+	               bool /*periodic*/)
 	{
 		mem_alloc(mem, MEM_READ_ONLY);
 		mem_copy_to(mem);
@@ -1092,7 +1095,7 @@ public:
 		}
 	};
 
-	int get_split_task_count(DeviceTask& task)
+	int get_split_task_count(DeviceTask& /*task*/)
 	{
 		return 1;
 	}