From 8015418605ef997f13f08bfa23489c0df69f4caf Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 22 Jun 2017 14:13:27 -0400 Subject: [PATCH] P4 to Git Change 1425764 by gandryey@gera-w8 on 2017/06/22 14:05:15 SWDEV-79445 - OCL generic changes and code clean-up - Keep the liquidflash calls for win32 only, since the interface isn't exposed under Linux at all Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#45 edit --- rocclr/runtime/platform/context.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/rocclr/runtime/platform/context.cpp b/rocclr/runtime/platform/context.cpp index 21ab9bb29e..e25e164c1a 100644 --- a/rocclr/runtime/platform/context.cpp +++ b/rocclr/runtime/platform/context.cpp @@ -18,8 +18,7 @@ #include "CL/cl_dx9_media_sharing.h" #endif //_WIN32 -#if (!defined(BUILD_HSA_TARGET) && defined(WITH_HSA_DEVICE) && \ - defined(WITH_AMDGPU_PRO)) || defined(_WIN32) +#if defined(_WIN32) #include "lf.h" #endif @@ -80,8 +79,7 @@ Context::~Context() { std::for_each(devices_.begin(), devices_.end(), std::mem_fun(&Device::release)); -#if (!defined(BUILD_HSA_TARGET) && defined(WITH_HSA_DEVICE) && \ - defined(WITH_AMDGPU_PRO)) || defined(_WIN32) +#if defined(_WIN32) lfTerminate(); #endif } @@ -263,8 +261,7 @@ int Context::create(const intptr_t* properties) { } } } -#if (!defined(BUILD_HSA_TARGET) && defined(WITH_HSA_DEVICE) && \ - defined(WITH_AMDGPU_PRO)) || defined(_WIN32) +#if defined(_WIN32) lfInit(); #endif return result;