From 77867d5700d4a01169f0cda0d7fd20dfb989c81d Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Tue, 17 Mar 2020 16:49:55 -0400 Subject: [PATCH] Correct the declaration of hipBindTextureToArray() The texture reference needs to be passed as a constant pointer. Change-Id: Iff171626536071fb2020cfff7132ec930577b1b9 [ROCm/clr commit: 7765792a42818a6c372415f224212c51e8f86e1a] --- .../clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h | 7 +++++++ projects/clr/hipamd/vdi/hip_texture.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h index 232ef44e7f..3a75fb680f 100644 --- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h +++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h @@ -3443,8 +3443,15 @@ hipError_t hipBindTexture2D(size_t* offset, struct texture& te } // C API +#if __HIP_VDI__ +hipError_t hipBindTextureToArray( + const textureReference* tex, + hipArray_const_t array, + const hipChannelFormatDesc* desc); +#else hipError_t hipBindTextureToArray(textureReference* tex, hipArray_const_t array, const hipChannelFormatDesc* desc); +#endif hipError_t ihipBindTextureToArrayImpl(TlsData *tls, int dim, enum hipTextureReadMode readMode, hipArray_const_t array, diff --git a/projects/clr/hipamd/vdi/hip_texture.cpp b/projects/clr/hipamd/vdi/hip_texture.cpp index 68c45308e5..0c9189a6ad 100644 --- a/projects/clr/hipamd/vdi/hip_texture.cpp +++ b/projects/clr/hipamd/vdi/hip_texture.cpp @@ -496,7 +496,7 @@ hipError_t ihipBindTextureToArray(const textureReference* texref, return ihipCreateTextureObject(const_cast(&texref->textureObject), &resDesc, &texDesc, &resViewDesc); } -hipError_t hipBindTextureToArray(textureReference* texref, +hipError_t hipBindTextureToArray(const textureReference* texref, hipArray_const_t array, const hipChannelFormatDesc* desc) { HIP_INIT_API(hipBindTextureToArray, texref, array, desc);