From eeb4c676fad82abc6e03f021523feb5f44ea77a8 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 7 May 2018 19:19:26 -0400 Subject: [PATCH] P4 to Git Change 1551379 by skeely@skeely_HSA_linux on 2018/05/07 19:08:50 SWDEV-147388 - Ignore metadata for TEXTURE_BUFFER objects. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocmemory.cpp#34 edit [ROCm/clr commit: 20257bd78b5338a190a10df4b89863ef096bae1a] --- projects/clr/rocclr/runtime/device/rocm/rocmemory.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/rocm/rocmemory.cpp b/projects/clr/rocclr/runtime/device/rocm/rocmemory.cpp index 7b5593da86..2b68d53143 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocmemory.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/rocmemory.cpp @@ -902,6 +902,15 @@ bool Image::createInteropImage() { return false; } + originalDeviceMemory_ = deviceMemory_; + + if(obj->getGLTarget() == GL_TEXTURE_BUFFER) { + hsa_status_t err = + hsa_ext_image_create(dev().getBackendDevice(), &imageDescriptor_, + originalDeviceMemory_, permission_, &hsaImageObject_); + return (err == HSA_STATUS_SUCCESS); + } + image_metadata desc; if (!desc.create(amdImageDesc_)) return false; @@ -909,8 +918,6 @@ bool Image::createInteropImage() { if (obj->getGLTarget() == GL_TEXTURE_CUBE_MAP) desc.setFace(obj->getCubemapFace()); - originalDeviceMemory_ = deviceMemory_; - hsa_status_t err = hsa_amd_image_create(dev().getBackendDevice(), &imageDescriptor_, amdImageDesc_, originalDeviceMemory_, permission_, &hsaImageObject_);