diff options
author | Thomas Dinges <blender@dingto.org> | 2014-12-02 15:45:39 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-12-02 15:45:39 +0300 |
commit | e3a6f1c1529f46049076020cbcab68e28de81c91 (patch) | |
tree | 2d64ae149c72bccfca954656672b7aaa4848bc8c /intern/cycles | |
parent | 4649f17c3897dcccb3cce3db93374112c8852498 (diff) |
Cycles: Remove workaround for missing sm_52 kernel, now we require it for Maxwell cards.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/device/device_cuda.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index b3d4215e51b..05f45ab92af 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -202,24 +202,8 @@ public: /* compute cubin name */ int major, minor; cuDeviceComputeCapability(&major, &minor, cuDevId); - string cubin; - /* ToDo: We don't bundle sm_52 kernel yet */ - if(major == 5 && minor == 2) { - if(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)); - - if(path_exists(cubin)) - /* self build sm_52 kernel? Use it. */ - return cubin; - else - /* use 5.0 kernel as workaround */ - minor = 0; - } - /* attempt to use kernel provided with blender */ if(experimental) cubin = path_get(string_printf("lib/kernel_experimental_sm_%d%d.cubin", major, minor)); |