[Bf-blender-cvs] [81a253a] master: Cycles OpenCL: Change environment flags for testing.

[Thomas Dinges]

Commit: 81a253a0d50d8a2e28e9e49104aaeff521fe98d6
Author: Thomas Dinges
Date:   Thu Jan 7 00:14:04 2016 +0100
Branches: master
https://developer.blender.org/rB81a253a0d50d8a2e28e9e49104aaeff521fe98d6

Cycles OpenCL: Change environment flags for testing.

CYCLES_OPENCL_TEST was removed, there was an insonsistency between
opencl_kernel_use_split() and opencl_get_usable_devices().

>From now on, to test non whitelisted devices please use either
CYCLES_OPENCL_MEGA_KERNEL_TEST or CYCLES_OPENCL_SPLIT_KERNEL_TEST.

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

M	intern/cycles/device/device_opencl.cpp

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

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 64a311f..991d007 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -229,8 +229,8 @@ bool opencl_device_version_check(cl_device_id device,
 void opencl_get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices)
 {
 	const bool force_all_platforms =
-	        (getenv("CYCLES_OPENCL_TEST") != NULL) ||
-	        (getenv("CYCLES_OPENCL_SPLIT_KERNEL_TEST")) != NULL;
+	        (getenv("CYCLES_OPENCL_MEGA_KERNEL_TEST") != NULL) ||
+	        (getenv("CYCLES_OPENCL_SPLIT_KERNEL_TEST") != NULL);
 	const cl_device_type device_type = opencl_device_type();
 	static bool first_time = true;
 #define FIRST_VLOG(severity) if(first_time) VLOG(severity)