P4 to Git Change 1191016 by skudchad@skudchad_test_win_opencl2 on 2015/09/15 18:01:18

EPR #425801 - Fix initLite toggle for windows.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#141 edit


[ROCm/clr commit: 507ec058c6]

projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp

@@ -304,7 +304,14 @@ CALGSLDevice::PerformFullInitialization() const
 bool
 CALGSLDevice::SetupAdapter(int32 &asic_id)
 {
-    bool initLite = (m_attribs.isWDDM2Enabled) ? true : false;
+    bool initLite = false;
+#ifdef ATI_OS_WIN
+    if(osGetVersion() >= AMD_OS_VERSION_WINDOWS_10)
+    {
+        initLite = true;
+    }
+#endif
+
     PerformAdapterInitialization_int(initLite);
 
     if (m_adp == 0)
@@ -383,7 +390,13 @@ CALGSLDevice::SetupAdapter(int32 &asic_id)
 bool
 CALGSLDevice::SetupContext(int32 &asic_id)
 {
-    bool initLite = (m_attribs.isWDDM2Enabled) ? true : false;
+    bool initLite = false;
+#ifdef ATI_OS_WIN
+    if(osGetVersion() >= AMD_OS_VERSION_WINDOWS_10)
+    {
+        initLite = true;
+    }
+#endif
     gsl::gsCtx* temp_cs = m_adp->createComputeContext(m_computeRing ? (m_isComputeRingIDForced ? m_forcedComputeEngineID :
                                                      getFirstAvailableComputeEngineID()) : GSL_ENGINEID_3DCOMPUTE0,
                                                      m_canDMA ? GSL_ENGINEID_DRMDMA0 : GSL_ENGINEID_INVALID, initLite);