[Bf-blender-cvs] [c70785bdf2] cycles_split_kernel: Cycles: Remove all split kernel stuff from opencl.h

Mai Lavelle noreply at git.blender.org
Wed Feb 22 11:20:39 CET 2017


Commit: c70785bdf2b53135fe7649ad7055801fbcb4428d
Author: Mai Lavelle
Date:   Wed Feb 15 04:51:38 2017 -0500
Branches: cycles_split_kernel
https://developer.blender.org/rBc70785bdf2b53135fe7649ad7055801fbcb4428d

Cycles: Remove all split kernel stuff from opencl.h

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

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

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

diff --git a/intern/cycles/device/opencl/opencl.h b/intern/cycles/device/opencl/opencl.h
index 6dab30d49c..3f3fa50195 100644
--- a/intern/cycles/device/opencl/opencl.h
+++ b/intern/cycles/device/opencl/opencl.h
@@ -17,7 +17,6 @@
 #ifdef WITH_OPENCL
 
 #include "device.h"
-#include "device_split_kernel.h"
 
 #include "util_map.h"
 #include "util_param.h"
@@ -426,8 +425,6 @@ protected:
 
 	virtual string build_options_for_base_program(
 	        const DeviceRequestedFeatures& /*requested_features*/);
-
-	friend class OpenCLSplitKernelFunction;
 };
 
 Device *opencl_create_mega_device(DeviceInfo& info, Stats& stats, bool background);
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp
index a7064c30a6..7c327ccaac 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -152,14 +152,15 @@ protected:
 	}
 
 	friend class OpenCLSplitKernel;
+	friend class OpenCLSplitKernelFunction;
 };
 
 class OpenCLSplitKernelFunction : public SplitKernelFunction {
 public:
-	OpenCLDeviceBase* device;
+	OpenCLDeviceSplitKernel* device;
 	OpenCLDeviceBase::OpenCLProgram program;
 
-	OpenCLSplitKernelFunction(OpenCLDeviceBase* device) : device(device) {}
+	OpenCLSplitKernelFunction(OpenCLDeviceSplitKernel* device) : device(device) {}
 	~OpenCLSplitKernelFunction() { program.release(); }
 
 	virtual bool enqueue(const KernelDimensions& dim, device_memory& kg, device_memory& data)




More information about the Bf-blender-cvs mailing list