[Bf-blender-cvs] [6a12a89] cycles_kernel_split: Cycles: Don't limit OpenCL devices by the env variable

Sergey Sharybin noreply at git.blender.org
Mon Mar 30 17:27:12 CEST 2015


Commit: 6a12a890cec2591016b84b9020a8fd66b44af543
Author: Sergey Sharybin
Date:   Mon Mar 30 17:52:29 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB6a12a890cec2591016b84b9020a8fd66b44af543

Cycles: Don't limit OpenCL devices by the env variable

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

M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 8319135..04fcb70 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -3559,13 +3559,7 @@ bool device_opencl_init(void) {
 
 	initialized = true;
 
-	// OpenCL disabled for now, only works with this environment variable set
-	if(!getenv("CYCLES_OPENCL_TEST")) {
-		result = false;
-	}
-	else {
-		result = clewInit() == CLEW_SUCCESS;
-	}
+	result = clewInit() == CLEW_SUCCESS;
 
 	return result;
 }




More information about the Bf-blender-cvs mailing list