Merge branch 'master' of https://github.com/ROCm-Developer-Tools/HIP into feature_native_vector_types

include/hip/hcc_detail/hip_runtime_api.h

@@ -2621,6 +2621,13 @@ hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex, hipArray
     return ihipBindTextureToArrayImpl(dim, readMode, array, desc, &tex);
 }
 
+template <class T, int dim, enum hipTextureReadMode readMode>
+inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode> *tex,
+                                               hipArray_const_t array,
+                                               const struct hipChannelFormatDesc* desc) {
+    return ihipBindTextureToArrayImpl(dim, readMode, array, *desc, tex);
+}
+
 // C API
 hipError_t hipBindTextureToMipmappedArray(const textureReference* tex,
                                           hipMipmappedArray_const_t mipmappedArray,

include/hip/hip_runtime_api.h

@@ -293,6 +293,12 @@ typedef enum hipDeviceAttribute_t {
     hipDeviceAttributeIntegrated,                        ///< iGPU
 } hipDeviceAttribute_t;
 
+enum hipComputeMode {
+    hipComputeModeDefault = 0,
+    hipComputeModeExclusive = 1,
+    hipComputeModeProhibited = 2,
+    hipComputeModeExclusiveProcess = 3
+};
 
 /**
  *     @}

include/hip/nvcc_detail/hip_runtime_api.h

@@ -163,6 +163,7 @@ typedef cudaSurfaceObject_t hipSurfaceObject_t;
 #define hipTextureType1D cudaTextureType1D
 #define hipTextureType1DLayered cudaTextureType1DLayered
 #define hipTextureType2D cudaTextureType2D
+#define hipTextureType2DLayered cudaTextureType2DLayered
 #define hipTextureType3D cudaTextureType3D
 #define hipDeviceMapHost cudaDeviceMapHost
 
@@ -1168,20 +1169,20 @@ inline static hipError_t hipOccupancyMaxPotentialBlockSize(int* minGridSize, int
     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,
                                         const void* devPtr, size_t size = UINT_MAX) {
     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,
                                         const void* devPtr, const struct hipChannelFormatDesc& desc,
                                         size_t size = UINT_MAX) {
     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) {
     return hipCUDAErrorTohipError(cudaUnbindTexture(tex));
 }
@@ -1198,7 +1199,14 @@ inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>&
     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,
+                                               hipArray_const_t array,
+                                               const struct hipChannelFormatDesc* desc) {
+    return hipCUDAErrorTohipError(cudaBindTextureToArray(tex, array, desc));
+}
+
+template <class T, int dim, enum hipTextureReadMode readMode>
 inline static hipError_t hipBindTextureToArray(struct texture<T, dim, readMode>& tex,
                                                hipArray_const_t array) {
     return hipCUDAErrorTohipError(cudaBindTextureToArray(tex, array));
@@ -1239,6 +1247,16 @@ inline static hipError_t hipGetTextureObjectResourceDesc(hipResourceDesc* pResDe
                                            hipTextureObject_t textureObject) {
     return hipCUDAErrorTohipError(cudaGetTextureObjectResourceDesc( pResDesc, textureObject));
 }
+
+inline static hipError_t hipGetTextureAlignmentOffset(size_t* offset, const textureReference* texref)
+{
+    return hipCUDAErrorTohipError(cudaGetTextureAlignmentOffset(offset,texref));
+}
+
+inline static hipError_t hipGetChannelDesc(hipChannelFormatDesc* desc, hipArray_const_t array)
+{
+    return hipCUDAErrorTohipError(cudaGetChannelDesc(desc,array));
+}
 #endif  //__CUDACC__
 
 #endif  // HIP_INCLUDE_HIP_NVCC_DETAIL_HIP_RUNTIME_API_H