From 78950c03bc59770e7ad254ec0f3df5c4542bc6db Mon Sep 17 00:00:00 2001 From: foreman Date: Sat, 11 Jul 2015 13:58:17 -0400 Subject: [PATCH] P4 to Git Change 1169722 by rili@rili_opencl_stg on 2015/07/10 17:39:21 EPR #419313 - Disable large allocaiton for Win 10. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#313 edit [ROCm/clr commit: 4285620de2934d4566ad55d446ac9ad15530ebc6] --- projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp index 11d103e1f3..e93b70858c 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpusettings.cpp @@ -10,6 +10,10 @@ #include +#if defined(_WIN32) +#include "versionhelpers.h" +#endif + namespace gpu { /*! \brief information for adjusting maximum workload time @@ -321,7 +325,11 @@ Settings::create( supportDepthsRGB_ = true; } if (use64BitPtr_) { - if ((GPU_ENABLE_LARGE_ALLOCATION) && (calAttr.isWorkstation)) { + if ((GPU_ENABLE_LARGE_ALLOCATION) && (calAttr.isWorkstation) +#if defined(_WIN32) + && (!IsWindows10OrGreater()) +#endif + ) { maxAllocSize_ = 64ULL * Gi; } else {