[Bf-blender-cvs] [867d3113076] master: Cycles: Fix warning with MSVC

Sergey Sharybin noreply at git.blender.org
Fri Apr 7 18:28:46 CEST 2017


Commit: 867d31130769b45c6f1b71ef619f247634ae890c
Author: Sergey Sharybin
Date:   Fri Apr 7 18:28:16 2017 +0200
Branches: master
https://developer.blender.org/rB867d31130769b45c6f1b71ef619f247634ae890c

Cycles: Fix warning with MSVC

===================================================================

M	intern/cycles/device/device_cuda.cpp
M	intern/cycles/device/opencl/opencl_split.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 606494f08ed..4c1a49878f5 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -1613,7 +1613,7 @@ int2 CUDASplitKernel::split_kernel_local_size()
 	return make_int2(32, 1);
 }
 
-int2 CUDASplitKernel::split_kernel_global_size(device_memory& /*kg*/, device_memory& /*data*/, DeviceTask */*task*/)
+int2 CUDASplitKernel::split_kernel_global_size(device_memory& /*kg*/, device_memory& /*data*/, DeviceTask * /*task*/)
 {
 	/* TODO(mai): implement something here to detect ideal work size */
 	return make_int2(256, 256);
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp
index 579dbc84f53..b8df57ec7b9 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -340,7 +340,7 @@ public:
 		return make_int2(64, 1);
 	}
 
-	virtual int2 split_kernel_global_size(device_memory& kg, device_memory& data, DeviceTask */*task*/)
+	virtual int2 split_kernel_global_size(device_memory& kg, device_memory& data, DeviceTask * /*task*/)
 	{
 		cl_device_type type = OpenCLInfo::get_device_type(device->cdDevice);
 		/* Use small global size on CPU devices as it seems to be much faster. */




More information about the Bf-blender-cvs mailing list