P4 to Git Change 1074863 by xcui@merged_opencl_jxcwin on 2014/09/09 13:34:10

EPR #397491 - only using OpenCL 1.2 onr multiple GPUs on mainline by default.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#460 edit

rocclr/runtime/device/gpu/gpudevice.cpp

@@ -752,7 +752,9 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
     appProfile_.init();
 
     // Open GSL device
-    bool reportOCL12Device = numOfDevices < 2 ? (OPENCL_VERSION < 200) : true;
+    bool reportOCL12Device = false;
+
+    reportOCL12Device = ((numOfDevices < 2) || (ordinal == 0)) ? (OPENCL_VERSION < 200) : true;
     if (!open(ordinal, appProfile_.enableHighPerformanceState(),
         appProfile_.reportAsOCL12Device() || reportOCL12Device)) {
         return false;