From 1c02ad9a84da81e14fbbe18d8f94e41b5ad52cb4 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 7 Mar 2018 15:57:50 -0500 Subject: [PATCH] P4 to Git Change 1523990 by gandryey@gera-lnx-rcf on 2018/03/07 15:53:52 SWDEV-79445 - OCL generic changes and code clean-up - Keep LF code under WITH_LIQUID_FLASH, since GSL path doesn't enable LF support Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#47 edit [ROCm/clr commit: a7d777f1fb1b8cc30a20033fea331b7366e22c6c] --- projects/clr/rocclr/runtime/platform/context.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/projects/clr/rocclr/runtime/platform/context.cpp b/projects/clr/rocclr/runtime/platform/context.cpp index bda38a4231..43e4c13216 100644 --- a/projects/clr/rocclr/runtime/platform/context.cpp +++ b/projects/clr/rocclr/runtime/platform/context.cpp @@ -18,7 +18,9 @@ #include "CL/cl_dx9_media_sharing.h" #endif //_WIN32 +#ifdef WITH_LIQUID_FLASH #include "lf.h" +#endif namespace amd { @@ -77,7 +79,9 @@ Context::~Context() { std::for_each(devices_.begin(), devices_.end(), std::mem_fun(&Device::release)); +#ifdef WITH_LIQUID_FLASH lfTerminate(); +#endif } int Context::checkProperties(const cl_context_properties* properties, Context::Info* info) { @@ -258,7 +262,10 @@ int Context::create(const intptr_t* properties) { } } +#ifdef WITH_LIQUID_FLASH lfInit(); +#endif + return result; }