diff options
| author | Patrick Mours <pmours@nvidia.com> | 2020-02-11 20:54:50 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2020-02-12 15:11:32 +0300 |
| commit | 153e001c743bf0f6bc259966418446441e00e200 (patch) | |
| tree | 280bafa4dfcba152fe774864b1636dd281be9713 /intern/cycles/device/CMakeLists.txt | |
| parent | cc085e228de70563ed0b6870d23ef3bb531c4798 (diff) | |
Cleanup: Move common CUDA/OptiX Cycles device code into separate file
This reduces code duplication between the CUDA and OptiX device implementations: The CUDA device
class is now split into declaration and definition (similar to the OpenCL device) and the OptiX device
class implements that and only overrides the functions it actually has to change, while using the CUDA
implementation for everything else.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D6814
Diffstat (limited to 'intern/cycles/device/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 35a79356957..aa5b65a2b73 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -34,13 +34,17 @@ set(SRC device_task.cpp ) +set(SRC_CUDA + cuda/device_cuda.h + cuda/device_cuda_impl.cpp +) + set(SRC_OPENCL - opencl/opencl.h + opencl/device_opencl.h + opencl/device_opencl_impl.cpp opencl/memory_manager.h - - opencl/opencl_split.cpp - opencl/opencl_util.cpp opencl/memory_manager.cpp + opencl/opencl_util.cpp ) if(WITH_CYCLES_NETWORK) @@ -98,4 +102,4 @@ endif() include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) -cycles_add_library(cycles_device "${LIB}" ${SRC} ${SRC_OPENCL} ${SRC_HEADERS}) +cycles_add_library(cycles_device "${LIB}" ${SRC} ${SRC_CUDA} ${SRC_OPENCL} ${SRC_HEADERS}) |