P4 to Git Change 1066051 by gandryey@gera-dev-w7 on 2014/08/13 18:18:00

EPR #404357 - [OCL 2.0][CPU] CPU should not report OCL 2.0 version in CLINFO
	- Report OCL1.2 by default on CPU

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#266 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpusettings.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#212 edit


[ROCm/clr commit: 75e2393a8f]

projects/clr/rocclr/runtime/device/cpu/cpusettings.cpp

@@ -39,8 +39,8 @@ Settings::create()
     enableExtension(ClAmdPrintf);
 
     // enableExtension(ClKhrSelectFpRoundingMode);
-    enableExtension(ClKhr3DImageWrites); 
-	
+    enableExtension(ClKhr3DImageWrites);
+
     // enableExtension(ClKhrFp16);
 
 #if defined(_WIN32)
@@ -49,7 +49,7 @@ Settings::create()
     enableExtension(ClKhrSpir);
 
     // Enable some OpenCL 2.0 extensions
-    if (OPENCL_MAJOR >= 2) {
+    if ((OPENCL_MAJOR >= 2) && (CPU_OPENCL_VERSION >= 200)) {
         partialDispatch_ = true;
         enableExtension(ClKhrSubGroups);
         supportDepthsRGB_ = true;