diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-08 13:02:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-08 13:02:54 +0300 |
| commit | 712f7c36402bd9b195d9e32dd72552e3dfc9ca24 (patch) | |
| tree | a82b0406475a2934ef6b21e430eb9fe65a34e1f9 /intern/cycles/device | |
| parent | ef7c36f5edf00bad99d5897758d780ae48cde6f3 (diff) | |
Cycles: Make it possible to access KernelGlobals from split data initialization function
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_split_kernel.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/opencl/opencl_split.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 0fb369ba50d..a630a3d1183 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -44,7 +44,7 @@ #include "util_types.h" #include "util_time.h" -#include "split/kernel_split_data.h" +#include "split/kernel_split_data_types.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/device/device_split_kernel.cpp b/intern/cycles/device/device_split_kernel.cpp index 1d58bfda117..b9705077fbf 100644 --- a/intern/cycles/device/device_split_kernel.cpp +++ b/intern/cycles/device/device_split_kernel.cpp @@ -17,7 +17,7 @@ #include "device_split_kernel.h" #include "kernel_types.h" -#include "kernel_split_data.h" +#include "kernel_split_data_types.h" #include "util_time.h" diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp index aadd9f778b5..b651b4a848e 100644 --- a/intern/cycles/device/opencl/opencl_split.cpp +++ b/intern/cycles/device/opencl/opencl_split.cpp @@ -21,7 +21,7 @@ #include "buffers.h" #include "kernel_types.h" -#include "kernel_split_data.h" +#include "kernel_split_data_types.h" #include "device_split_kernel.h" |