[Bf-blender-cvs] [e3a6f1c1] master: Cycles: Remove workaround for missing sm_52 kernel, now we require it for Maxwell cards.

[Thomas Dinges]

Commit: e3a6f1c1529f46049076020cbcab68e28de81c91
Author: Thomas Dinges
Date:   Tue Dec 2 13:45:39 2014 +0100
Branches: master
https://developer.blender.org/rBe3a6f1c1529f46049076020cbcab68e28de81c91

Cycles: Remove workaround for missing sm_52 kernel, now we require it for Maxwell cards.

===================================================================

M	intern/cycles/device/device_cuda.cpp

===================================================================

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index b3d4215..05f45ab 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));