[Bf-blender-cvs] [4800c52] master: Cleanup: Remove unused checks in CUDA device code.

Thomas Dinges noreply at git.blender.org
Wed Jul 2 01:13:51 CEST 2014


Commit: 4800c52700b436d684823edf2b1af6aeec1ae1db
Author: Thomas Dinges
Date:   Wed Jul 2 01:12:13 2014 +0200
https://developer.blender.org/rB4800c52700b436d684823edf2b1af6aeec1ae1db

Cleanup: Remove unused checks in CUDA device code.

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

M	intern/cycles/device/device_cuda.cpp

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

diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 0aa09ac..92d29e4 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -226,7 +226,7 @@ public:
 		cuda_assert(cuCtxDestroy(cuContext));
 	}
 
-	bool support_device(bool experimental, bool branched)
+	bool support_device(bool experimental)
 	{
 		int major, minor;
 		cuDeviceComputeCapability(&major, &minor, cuDevId);
@@ -332,7 +332,7 @@ public:
 			return false;
 		
 		/* check if GPU is supported */
-		if(!support_device(experimental, false))
+		if(!support_device(experimental))
 			return false;
 
 		/* get kernel */
@@ -594,7 +594,7 @@ public:
 		CUdeviceptr d_rng_state = cuda_device_ptr(rtile.rng_state);
 
 		/* get kernel function */
-		if(branched && support_device(true, branched)) {
+		if(branched) {
 			cuda_assert(cuModuleGetFunction(&cuPathTrace, cuModule, "kernel_cuda_branched_path_trace"));
 		}
 		else {




More information about the Bf-blender-cvs mailing list