[Bf-blender-cvs] [cb8935583e] temp-cycles-denoising: Cycles Denoising: Fix CUDA runtime kernel compilation
Lukas Stockner
noreply at git.blender.org
Mon Feb 13 02:06:00 CET 2017
Commit: cb8935583e0b0d47acfff1628038c42db81fb663
Author: Lukas Stockner
Date: Mon Feb 13 00:25:10 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rBcb8935583e0b0d47acfff1628038c42db81fb663
Cycles Denoising: Fix CUDA runtime kernel compilation
===================================================================
M intern/cycles/device/device_cuda.cpp
M intern/cycles/filter/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index d9a66b7463..a208cd7baf 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -265,7 +265,7 @@ public:
* kernel sources md5 and only depends on compiler or compilation settings.
*/
string compile_kernel_get_common_cflags(
- const DeviceRequestedFeatures& requested_features)
+ const DeviceRequestedFeatures* requested_features)
{
const int cuda_version = cuewCompilerVersion();
const int machine = system_cpu_bits();
@@ -280,8 +280,8 @@ public:
machine,
cuda_version,
include.c_str());
- if(use_adaptive_compilation()) {
- cflags += " " + requested_features.get_build_options();
+ if(requested_features && use_adaptive_compilation()) {
+ cflags += " " + requested_features->get_build_options();
}
const char *extra_cflags = getenv("CYCLES_CUDA_EXTRA_CFLAGS");
if(extra_cflags) {
@@ -344,7 +344,7 @@ public:
}
const string common_cflags =
- filter? "" : compile_kernel_get_common_cflags(requested_features);
+ compile_kernel_get_common_cflags(filter? NULL : &requested_features);
/* Try to use locally compiled kernel. */
const string kernel_path = path_get("kernel");
diff --git a/intern/cycles/filter/CMakeLists.txt b/intern/cycles/filter/CMakeLists.txt
index 9bee0c2ef6..a5d7e29c74 100644
--- a/intern/cycles/filter/CMakeLists.txt
+++ b/intern/cycles/filter/CMakeLists.txt
@@ -21,6 +21,9 @@ set(SRC
set(SRC_HEADERS
filter.h
+ filter_compat_cpu.h
+ filter_compat_cuda.h
+ filter_compat_opencl.h
filter_defines.h
filter_features.h
filter_features_sse.h
More information about the Bf-blender-cvs
mailing list