From e73ae9c166cb70e05afb00c588aba598c9c0326c Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 13 Nov 2014 16:56:11 -0500 Subject: [PATCH] P4 to Git Change 1096846 by rili@rili_opencl_stg on 2014/11/13 16:23:44 EPR #407215 - reset host memory pointer of a image view based on original image ReviewBoard #6301 Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#480 edit [ROCm/clr commit: b3f320ce7d9b14ac13042fd6db4cac001903b6c4] --- projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp index 91369c631a..8f4aff1d0e 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpudevice.cpp @@ -1693,7 +1693,11 @@ Device::createImage(amd::Memory& owner, bool directAccess) const return NULL; } // Create a view on the specified device - return (gpu::Memory*)createView(owner, *devParent); + gpuImage = (gpu::Memory*)createView(owner, *devParent); + if ((gpuImage != NULL) && (gpuImage->owner() != NULL)) { + gpuImage->owner()->setHostMem((address)(owner.parent()->getHostMem()) + gpuImage->owner()->getOrigin()); + } + return gpuImage ; } gpuImage = new gpu::Image(*this, owner,