Merge branch 'master' into blender2.8
[blender.git] / intern / cycles / device / device_cuda.cpp
index 19e68007934483239e1f0657b47c90cd9df87dc3..e53aec0fbb97a61c1fd04a45bc0e1bce665b1906 100644 (file)
@@ -105,7 +105,8 @@ public:
                                                    device_memory& use_queues_flag,
                                                    device_memory& work_pool_wgs);
 
-       virtual SplitKernelFunction* get_split_kernel_function(string kernel_name, const DeviceRequestedFeatures&);
+       virtual SplitKernelFunction* get_split_kernel_function(const string& kernel_name,
+                                                              const DeviceRequestedFeatures&);
        virtual int2 split_kernel_local_size();
        virtual int2 split_kernel_global_size(device_memory& kg, device_memory& data, DeviceTask *task);
 };
@@ -2058,7 +2059,8 @@ bool CUDASplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim
        return !device->have_error();
 }
 
-SplitKernelFunction* CUDASplitKernel::get_split_kernel_function(string kernel_name, const DeviceRequestedFeatures&)
+SplitKernelFunction* CUDASplitKernel::get_split_kernel_function(const string& kernel_name,
+                                                                const DeviceRequestedFeatures&)
 {
        CUfunction func;