From 4032d01baff32157cedc8c2fa691c54ab7f809b4 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 12 Jun 2018 12:11:19 -0400 Subject: [PATCH] P4 to Git Change 1567203 by skudchad@skudchad_test2_win_opencl on 2018/06/12 12:01:43 SWDEV-145570 - [HIP] - Since getMemoryObject is now used in hip_texture it shouldnt be inline Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#32 edit [ROCm/hip commit: 2568c8042f55b43132e1f9261744910f382e6c4a] --- projects/hip/api/hip/hip_memory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/hip/api/hip/hip_memory.cpp b/projects/hip/api/hip/hip_memory.cpp index 4d8e91250f..cd4c60c319 100644 --- a/projects/hip/api/hip/hip_memory.cpp +++ b/projects/hip/api/hip/hip_memory.cpp @@ -36,7 +36,7 @@ extern void getDrvChannelOrderAndType(const enum hipArray_Format Format, cl_channel_order* channelOrder, cl_channel_type* channelType); -inline amd::Memory* getMemoryObject(const void* ptr, size_t& offset) { +amd::Memory* getMemoryObject(const void* ptr, size_t& offset) { amd::Memory *memObj = amd::MemObjMap::FindMemObj(ptr); if (memObj != nullptr) { offset = reinterpret_cast(ptr) - reinterpret_cast(memObj->getSvmPtr());