From e3a6f1c1529f46049076020cbcab68e28de81c91 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 2 Dec 2014 13:45:39 +0100 Subject: Cycles: Remove workaround for missing sm_52 kernel, now we require it for Maxwell cards. --- intern/cycles/device/device_cuda.cpp | 16 ---------------- 1 file changed, 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)); -- cgit v1.2.3