diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-04 02:46:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-04 02:46:34 +0300 |
| commit | eeb621566af3c6737393d87ef33237fc96d06d87 (patch) | |
| tree | 36a4d1bd54142368148fb3a82c932f874c011fc1 /intern/cycles/device | |
| parent | 1bc0cd00713a573bed76ab35b6ae0cc0e9edc307 (diff) | |
| parent | 36c1122b96ca550a541f9cea9ed2673319c7467b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 959c0aa97c9..75e78e038ea 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -77,4 +77,4 @@ endif() include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) -add_library(cycles_device ${SRC} ${SRC_OPENCL} ${SRC_HEADERS}) +cycles_add_library(cycles_device ${SRC} ${SRC_OPENCL} ${SRC_HEADERS}) diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index a7d20c67b6d..24ae79e5074 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -348,7 +348,6 @@ public: const DeviceRequestedFeatures& requested_features, bool filter=false, bool split=false) { - const int cuda_version = cuewCompilerVersion(); const int machine = system_cpu_bits(); const string source_path = path_get("source"); const string include_path = source_path; @@ -356,10 +355,8 @@ public: "--ptxas-options=\"-v\" " "--use_fast_math " "-DNVCC " - "-D__KERNEL_CUDA_VERSION__=%d " "-I\"%s\"", machine, - cuda_version, include_path.c_str()); if(!filter && use_adaptive_compilation()) { cflags += " " + requested_features.get_build_options(); |