From 600b1006c828fa145e4df34f147a43ece6c6cf5d Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Tue, 17 Mar 2020 16:47:54 -0400 Subject: [PATCH] Correct the declaration of hipBindTexture() The texture reference needs to be passed as a constant pointer. Change-Id: I36ca0bddaba30becfc2ce70dd9e5b7db66c57f27 --- hipamd/include/hip/hcc_detail/hip_runtime_api.h | 9 +++++++++ hipamd/vdi/hip_texture.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/hipamd/include/hip/hcc_detail/hip_runtime_api.h index 85b8e11eae..232ef44e7f 100644 --- a/hipamd/include/hip/hcc_detail/hip_runtime_api.h +++ b/hipamd/include/hip/hcc_detail/hip_runtime_api.h @@ -3362,8 +3362,17 @@ const char* hipKernelNameRef(const hipFunction_t f); class TlsData; +#if __HIP_VDI__ +hipError_t hipBindTexture( + size_t* offset, + const textureReference* tex, + const void* devPtr, + const hipChannelFormatDesc* desc, + size_t size = UINT_MAX); +#else hipError_t hipBindTexture(size_t* offset, textureReference* tex, const void* devPtr, const hipChannelFormatDesc* desc, size_t size = UINT_MAX); +#endif hipError_t ihipBindTextureImpl(TlsData *tls, int dim, enum hipTextureReadMode readMode, size_t* offset, const void* devPtr, const struct hipChannelFormatDesc* desc, diff --git a/hipamd/vdi/hip_texture.cpp b/hipamd/vdi/hip_texture.cpp index db405810a6..68c45308e5 100644 --- a/hipamd/vdi/hip_texture.cpp +++ b/hipamd/vdi/hip_texture.cpp @@ -607,7 +607,7 @@ hipError_t hipUnbindTexture(const textureReference* texref) { } hipError_t hipBindTexture(size_t* offset, - textureReference* texref, + const textureReference* texref, const void* devPtr, const hipChannelFormatDesc* desc, size_t size) {