From f50fca365af3c9a1e15ddf2884761839fbbd3ecc Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Wed, 21 Jun 2023 04:59:53 +0530
Subject: [PATCH] SWDEV-393139 - Update mipmap apis and types (#3260)

Add hipmipmappedArray to differentiate cuda
and driver apis on Nvidia
Label mipmap driver apis as deprecated
Add num_channels to hipMipmappedArray

Change-Id: Ief4ea80941e25d21acafd213b3a84a65eb20cf92
---
 include/hip/driver_types.h    |  2 ++
 include/hip/hip_runtime_api.h | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/hip/driver_types.h b/include/hip/driver_types.h
index e6cd575e54..695d047fc9 100644
--- a/include/hip/driver_types.h
+++ b/include/hip/driver_types.h
@@ -126,8 +126,10 @@ typedef struct hipMipmappedArray {
   unsigned int max_mipmap_level;
   unsigned int flags;
   enum hipArray_Format format;
+  unsigned int num_channels;
 } hipMipmappedArray;
 typedef struct hipMipmappedArray* hipMipmappedArray_t;
+typedef hipMipmappedArray_t hipmipmappedArray;
 typedef const struct hipMipmappedArray* hipMipmappedArray_const_t;
 /**
  * hip resource types
diff --git a/include/hip/hip_runtime_api.h b/include/hip/hip_runtime_api.h
index 3a44460942..186c357f03 100644
--- a/include/hip/hip_runtime_api.h
+++ b/include/hip/hip_runtime_api.h
@@ -5442,6 +5442,7 @@ hipError_t hipExtLaunchKernel(const void* function_address, dim3 numBlocks, dim3
  * @returns #hipSuccess, #hipErrorInvalidValue
  *
  */
+DEPRECATED(DEPRECATED_MSG)
 hipError_t hipBindTextureToMipmappedArray(
     const textureReference* tex,
     hipMipmappedArray_const_t mipmappedArray,
@@ -6030,12 +6031,6 @@ hipError_t hipTexRefSetMipmappedArray(
     struct hipMipmappedArray* mipmappedArray,
     unsigned int Flags);
 
-// doxygen end deprecated texture management
-/**
- * @}
- */
-
-// The following are not supported.
 /**
  *
  *  @addtogroup TextureU Texture Management [Not supported]
@@ -6053,6 +6048,7 @@ hipError_t hipTexRefSetMipmappedArray(
  * @returns #hipSuccess, #hipErrorNotSupported, #hipErrorInvalidValue
  *
  */
+DEPRECATED(DEPRECATED_MSG)
 hipError_t hipMipmappedArrayCreate(
     hipMipmappedArray_t* pHandle,
     HIP_ARRAY3D_DESCRIPTOR* pMipmappedArrayDesc,
@@ -6065,6 +6061,7 @@ hipError_t hipMipmappedArrayCreate(
  * @returns #hipSuccess, #hipErrorInvalidValue
  *
  */
+DEPRECATED(DEPRECATED_MSG)
 hipError_t hipMipmappedArrayDestroy(hipMipmappedArray_t hMipmappedArray);
 /**
  * @brief Get a mipmapped array on a mipmapped level.
@@ -6076,11 +6073,12 @@ hipError_t hipMipmappedArrayDestroy(hipMipmappedArray_t hMipmappedArray);
  * @returns #hipSuccess, #hipErrorInvalidValue
  *
  */
+DEPRECATED(DEPRECATED_MSG)
 hipError_t hipMipmappedArrayGetLevel(
     hipArray_t* pLevelArray,
     hipMipmappedArray_t hMipMappedArray,
     unsigned int level);
-// doxygen end unsuppported texture management
+// doxygen end deprecated texture management
 /**
  * @}
  */
@@ -8204,6 +8202,7 @@ static inline hipError_t hipBindTextureToArray(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
+DEPRECATED(DEPRECATED_MSG)
 static inline hipError_t hipBindTextureToMipmappedArray(
     const struct texture<T, dim, readMode> &tex,
     hipMipmappedArray_const_t mipmappedArray)
@@ -8228,6 +8227,7 @@ static inline hipError_t hipBindTextureToMipmappedArray(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
+DEPRECATED(DEPRECATED_MSG)
 static inline hipError_t hipBindTextureToMipmappedArray(
     const struct texture<T, dim, readMode> &tex,
     hipMipmappedArray_const_t mipmappedArray,