From 249153c6e028273b85bb7bd144c3adcbd6f5ec93 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Mon, 10 Aug 2015 20:23:20 -0400
Subject: [PATCH] P4 to Git Change 1178942 by bdhanase@bala_workpc_ocl on
 2015/08/10 20:14:46

	EPR #397491 - Disable OpenCL2.0 on Win 10 for now

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#319 edit
---
 rocclr/runtime/device/gpu/gpusettings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rocclr/runtime/device/gpu/gpusettings.cpp b/rocclr/runtime/device/gpu/gpusettings.cpp
index 8554c45e9d..3744157a8f 100644
--- a/rocclr/runtime/device/gpu/gpusettings.cpp
+++ b/rocclr/runtime/device/gpu/gpusettings.cpp
@@ -295,7 +295,7 @@ Settings::create(
 
         if (ciPlus_) {
             libSelector_ = amd::GPU_Library_CI;
-            if (LP64_SWITCH(WINDOWS_SWITCH(viPlus_, false), true)) {
+            if (LP64_SWITCH(WINDOWS_SWITCH((viPlus_ && !IsWindows10OrGreater()), false), true)) {
                 oclVersion_ = !reportAsOCL12Device && calAttr.isOpenCL200Device ?
                     XCONCAT(OpenCL, XCONCAT(OPENCL_MAJOR, OPENCL_MINOR)) : OpenCL12;
             }