diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-01-14 14:51:11 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-01-14 14:56:08 +0300 |
| commit | 3ba9742be244db4ef24e271fd97eb490fdef7d0d (patch) | |
| tree | e1343c2d0b86c55a3237d3cff4c06c7c449f469f /intern/cycles/device | |
| parent | cc55f97da9cca7a27f2313b7405d3aad277029d7 (diff) | |
Cycles: Remove the experimental CUDA kernel.
This commit removes the experimental CUDA kernel, making SSS and CMJ
regular features.
Several improvements have been made in the past few
weeks (thanks Sergey!) which make SSS render several times faster (2-3x
compared to 2.76b) on the GPU, and the increased VRAM usage has also been
fixed. Therefore the experimental kernel is no longer needed.
Differential Revision: https://developer.blender.org/D1726
Manual has been updated: too:
https://www.blender.org/manual/render/cycles/features.html
Diffstat (limited to 'intern/cycles/device')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 88f1a86d6ac..a91e4826b33 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -253,10 +253,7 @@ public: string cubin; /* attempt to use kernel provided with blender */ - if(requested_features.experimental) - cubin = path_get(string_printf("lib/kernel_experimental_sm_%d%d.cubin", major, minor)); - else - cubin = path_get(string_printf("lib/kernel_sm_%d%d.cubin", major, minor)); + cubin = path_get(string_printf("lib/kernel_sm_%d%d.cubin", major, minor)); VLOG(1) << "Testing for pre-compiled kernel " << cubin; if(path_exists(cubin)) { VLOG(1) << "Using precompiled kernel"; @@ -275,10 +272,7 @@ public: major, minor, md5.c_str()); #else - if(requested_features.experimental) - cubin = string_printf("cycles_kernel_experimental_sm%d%d_%s.cubin", major, minor, md5.c_str()); - else - cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str()); + cubin = string_printf("cycles_kernel_sm%d%d_%s.cubin", major, minor, md5.c_str()); #endif cubin = path_user_get(path_join("cache", cubin)); @@ -338,10 +332,6 @@ public: #ifdef KERNEL_USE_ADAPTIVE command += " " + feature_build_options; -#else - if(requested_features.experimental) { - command += " -D__KERNEL_EXPERIMENTAL__"; - } #endif const char* extra_cflags = getenv("CYCLES_CUDA_EXTRA_CFLAGS"); |