Merge pull request #549 from gargrahul/correct_bindtex_syntax_nvcc
Corrected enum type for TextureReadMode
[ROCm/clr commit: 8820eee3a2]
Этот коммит содержится в:
Коммит
8001ecea35
1 file changed
+4
-4
@@ -1169,20 +1169,20 @@ inline static hipError_t hipOccupancyMaxPotentialBlockSize(int* minGridSize, int
|
|||||||
return hipCUDAErrorTohipError(cerror);
|
return hipCUDAErrorTohipError(cerror);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class T, int dim, enum cudaTextureReadMode readMode>
|
template <class T, int dim, enum hipTextureReadMode readMode>
|
||||||
inline static hipError_t hipBindTexture(size_t* offset, const struct texture<T, dim, readMode>& tex,
|
inline static hipError_t hipBindTexture(size_t* offset, const struct texture<T, dim, readMode>& tex,
|
||||||
const void* devPtr, size_t size = UINT_MAX) {
|
const void* devPtr, size_t size = UINT_MAX) {
|
||||||
return hipCUDAErrorTohipError(cudaBindTexture(offset, tex, devPtr, size));
|
return hipCUDAErrorTohipError(cudaBindTexture(offset, tex, devPtr, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class T, int dim, enum cudaTextureReadMode readMode>
|
template <class T, int dim, enum hipTextureReadMode readMode>
|
||||||
inline static hipError_t hipBindTexture(size_t* offset, struct texture<T, dim, readMode>& tex,
|
inline static hipError_t hipBindTexture(size_t* offset, struct texture<T, dim, readMode>& tex,
|
||||||
const void* devPtr, const struct hipChannelFormatDesc& desc,
|
const void* devPtr, const struct hipChannelFormatDesc& desc,
|
||||||
size_t size = UINT_MAX) {
|
size_t size = UINT_MAX) {
|
||||||
return hipCUDAErrorTohipError(cudaBindTexture(offset, tex, devPtr, desc, size));
|
return hipCUDAErrorTohipError(cudaBindTexture(offset, tex, devPtr, desc, size));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class T, int dim, enum cudaTextureReadMode readMode>
|
template <class T, int dim, enum hipTextureReadMode readMode>
|
||||||
inline static hipError_t hipUnbindTexture(struct texture<T, dim, readMode>* tex) {
|
inline static hipError_t hipUnbindTexture(struct texture<T, dim, readMode>* tex) {
|
||||||
return hipCUDAErrorTohipError(cudaUnbindTexture(tex));
|
return hipCUDAErrorTohipError(cudaUnbindTexture(tex));
|
||||||
}
|
}
|
||||||
@@ -1199,7 +1199,7 @@ inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>&
|
|||||||
return hipCUDAErrorTohipError(cudaBindTextureToArray(tex, array, desc));
|
return hipCUDAErrorTohipError(cudaBindTextureToArray(tex, array, desc));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class T, int dim, enum cudaTextureReadMode readMode>
|
template <class T, int dim, enum hipTextureReadMode readMode>
|
||||||
inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex,
|
inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex,
|
||||||
hipArray_const_t array) {
|
hipArray_const_t array) {
|
||||||
return hipCUDAErrorTohipError(cudaBindTextureToArray(tex, array));
|
return hipCUDAErrorTohipError(cudaBindTextureToArray(tex, array));
|
||||||
|
|||||||
Reference in new issue
Block a user