From 20479b56243473c49799d08cfd09cb58cefb2cb9 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 10 Sep 2015 17:35:12 -0400 Subject: [PATCH] P4 to Git Change 1189788 by wchau@wchau_WINDOWS7_OCL on 2015/09/10 17:11:22 EPR #425801 - Only apply optimize init sequeuce for Windows 10 - to avoid issue observed in EPR#425801 for Win7. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#140 edit [ROCm/clr commit: ef264b7508381b0302e8b465d2d527d3c29c7bde] --- .../rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp index 9000e1bf0f..3e27b4b876 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp @@ -304,7 +304,8 @@ CALGSLDevice::PerformFullInitialization() const bool CALGSLDevice::SetupAdapter(int32 &asic_id) { - PerformAdapterInitialization_int(false); + bool initLite = (m_attribs.isWDDM2Enabled) ? true : false; + PerformAdapterInitialization_int(initLite); if (m_adp == 0) { @@ -382,9 +383,10 @@ CALGSLDevice::SetupAdapter(int32 &asic_id) bool CALGSLDevice::SetupContext(int32 &asic_id) { + bool initLite = (m_attribs.isWDDM2Enabled) ? true : false; 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, false); + m_canDMA ? GSL_ENGINEID_DRMDMA0 : GSL_ENGINEID_INVALID, initLite); temp_cs->getMainSubCtx()->setVPUMask(m_vpuMask); m_maxtexturesize = temp_cs->getMaxTextureSize();