From 94759e212e247eb57f8dabfeebef31c7c8a3ba9c Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 17 May 2017 15:49:02 -0400 Subject: [PATCH] P4 to Git Change 1410787 by gandryey@gera-w8 on 2017/05/17 15:15:22 SWDEV-120180 - [amdgpu-pro] OpenCL support for SSG - Protect amdgpu-pro headers with the define for easier open source integration Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#52 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#21 edit --- rocclr/runtime/device/rocm/rocdevice.cpp | 2 ++ rocclr/runtime/device/rocm/rocmemory.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/rocclr/runtime/device/rocm/rocdevice.cpp b/rocclr/runtime/device/rocm/rocdevice.cpp index 110b2c7891..0b74369e1a 100644 --- a/rocclr/runtime/device/rocm/rocdevice.cpp +++ b/rocclr/runtime/device/rocm/rocdevice.cpp @@ -25,7 +25,9 @@ #endif // !defined(WITH_LIGHTNING_COMPILER) #include "device/rocm/rocmemory.hpp" #include "device/rocm/rocglinterop.hpp" +#ifdef WITH_AMDGPU_PRO #include "pro/prodriver.hpp" +#endif #include #include #include diff --git a/rocclr/runtime/device/rocm/rocmemory.cpp b/rocclr/runtime/device/rocm/rocmemory.cpp index ce447ec365..a41ace2c9a 100644 --- a/rocclr/runtime/device/rocm/rocmemory.cpp +++ b/rocclr/runtime/device/rocm/rocmemory.cpp @@ -20,7 +20,9 @@ #include "platform/memory.hpp" #include "platform/sampler.hpp" #include "amdocl/cl_gl_amd.hpp" +#ifdef WITH_AMDGPU_PRO #include "pro/prodriver.hpp" +#endif namespace roc {