diff options
| author | Patrick Mours <pmours@nvidia.com> | 2020-02-17 15:35:31 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2020-02-17 16:27:44 +0300 |
| commit | 2278aa0da9d6a046ff014fab4b0cc6156394b0d1 (patch) | |
| tree | 7c9e494c59875fb5f0004bfc40c9fa29521b365b /intern/cycles/CMakeLists.txt | |
| parent | 12b6ddaf953056e36f1e86d7d79537cb8b3dbe4e (diff) | |
Cycles: Add support for adaptive kernel compilation to OptiX device
This modifies the common CUDA implementation for adaptive kernel compilation slightly to support both CUBIN and PTX output (the latter which is then used in the OptiX device). It also fixes adaptive kernel compilation on Windows.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D6851
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 6f6bd7ec2cc..1014831c403 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -228,11 +228,8 @@ if(WITH_CYCLES_DEVICE_OPTIX) SYSTEM ${OPTIX_INCLUDE_DIR} ) - - # Need pre-compiled CUDA binaries in the OptiX device - set(WITH_CYCLES_CUDA_BINARIES ON) else() - message(STATUS "Optix not found, disabling it from Cycles") + message(STATUS "OptiX not found, disabling it from Cycles") set(WITH_CYCLES_DEVICE_OPTIX OFF) endif() endif() |