From 17cc99c05d34ec2036b868fa16fd043a72edbc7e Mon Sep 17 00:00:00 2001 From: Tao Sang Date: Thu, 21 Oct 2021 17:36:14 -0400 Subject: [PATCH] SWDEV-306947 Enable hipAddressModeBorder Enable hipAddressModeBorder. Fix default of height of hipMallocArray(). Some code improvement. Change-Id: I57045118e7adf915074c547cbe76349a4cfd72d8 --- .../include/hip/nvidia_detail/nvidia_hip_runtime_api.h | 2 +- hipamd/src/hip_texture.cpp | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h index a5b3c556ae..d4facc9360 100644 --- a/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h +++ b/hipamd/include/hip/nvidia_detail/nvidia_hip_runtime_api.h @@ -1069,7 +1069,7 @@ inline static hipError_t hipMallocManaged(void** ptr, size_t size, unsigned int } inline static hipError_t hipMallocArray(hipArray** array, const hipChannelFormatDesc* desc, - size_t width, size_t height, + size_t width, size_t height __dparm(0), unsigned int flags __dparm(hipArrayDefault)) { return hipCUDAErrorTohipError(cudaMallocArray(array, desc, width, height, flags)); } diff --git a/hipamd/src/hip_texture.cpp b/hipamd/src/hip_texture.cpp index 6e6360bee1..7c8995aa25 100644 --- a/hipamd/src/hip_texture.cpp +++ b/hipamd/src/hip_texture.cpp @@ -133,10 +133,6 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject, if (pResDesc->resType == hipResourceTypeMipmappedArray) { return hipErrorNotSupported; } - // We don't program the border_color_ptr field in the HW sampler SRD. - if (pTexDesc->addressMode[0] == hipAddressModeBorder) { - return hipErrorNotSupported; - } // We don't program the max_ansio_ratio field in the the HW sampler SRD. if (pTexDesc->maxAnisotropy != 0) { return hipErrorNotSupported; @@ -172,17 +168,13 @@ hipError_t ihipCreateTextureObject(hipTextureObject_t* pTexObject, #define CL_FILTER_NONE 0x1142 #endif cl_filter_mode filterMode = CL_FILTER_NONE; + cl_filter_mode mipFilterMode = CL_FILTER_NONE; #undef CL_FILTER_NONE // hipTextureDesc::filterMode is ignored if hipResourceDesc::resType is hipResourceTypeLinear. if (pResDesc->resType != hipResourceTypeLinear) { filterMode = hip::getCLFilterMode(pTexDesc->filterMode); } -#ifndef CL_FILTER_NONE -#define CL_FILTER_NONE 0x1142 -#endif - cl_filter_mode mipFilterMode = CL_FILTER_NONE; -#undef CL_FILTER_NONE if (pResDesc->resType == hipResourceTypeMipmappedArray) { mipFilterMode = hip::getCLFilterMode(pTexDesc->mipmapFilterMode); }