Skip to content

Commit 22e9263

Browse files
authored
SWDEV-368553 - Update mipmap apis' comments (#3286)
Remove DEPRECATED(DEPRECATED_MSG) from mipmap Apis' comments. Add "This API is implemented on Windows, under development on Linux." in mipmap Apis' notes. Add DEPRECATED(DEPRECATED_MSG) to texture reference Apis. Change-Id: Ief4ea81941e25d21bcafd213b3a84a65eb23cf93
1 parent 8b065da commit 22e9263

File tree

2 files changed

+113
-103
lines changed

2 files changed

+113
-103
lines changed

docs/.doxygen/mainpage.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ This is the full HIP Runtime API reference. The API is organized into
2424
- @ref Clang
2525
- @ref Texture
2626
- @ref TextureD
27-
- @ref TextureU
2827
- @ref Runtime
2928
- @ref Callback
3029
- @ref Graph

include/hip/hip_runtime_api.h

Lines changed: 113 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -4107,14 +4107,6 @@ hipError_t hipMalloc3D(hipPitchedPtr* pitchedDevPtr, hipExtent extent);
41074107
* @see hipMalloc, hipMallocPitch, hipFree, hipMallocArray, hipHostMalloc, hipHostFree
41084108
*/
41094109
hipError_t hipFreeArray(hipArray* array);
4110-
/**
4111-
* @brief Frees a mipmapped array on the device
4112-
*
4113-
* @param[in] mipmappedArray - Pointer to mipmapped array to free
4114-
*
4115-
* @return #hipSuccess, #hipErrorInvalidValue
4116-
*/
4117-
hipError_t hipFreeMipmappedArray(hipMipmappedArray_t mipmappedArray);
41184110
/**
41194111
* @brief Allocate an array on the device.
41204112
*
@@ -4128,36 +4120,6 @@ hipError_t hipFreeMipmappedArray(hipMipmappedArray_t mipmappedArray);
41284120
*/
41294121
hipError_t hipMalloc3DArray(hipArray** array, const struct hipChannelFormatDesc* desc,
41304122
struct hipExtent extent, unsigned int flags);
4131-
/**
4132-
* @brief Allocate a mipmapped array on the device
4133-
*
4134-
* @param[out] mipmappedArray - Pointer to allocated mipmapped array in device memory
4135-
* @param[in] desc - Requested channel format
4136-
* @param[in] extent - Requested allocation size (width field in elements)
4137-
* @param[in] numLevels - Number of mipmap levels to allocate
4138-
* @param[in] flags - Flags for extensions
4139-
*
4140-
* @return #hipSuccess, #hipErrorInvalidValue, #hipErrorMemoryAllocation
4141-
*/
4142-
hipError_t hipMallocMipmappedArray(
4143-
hipMipmappedArray_t *mipmappedArray,
4144-
const struct hipChannelFormatDesc* desc,
4145-
struct hipExtent extent,
4146-
unsigned int numLevels,
4147-
unsigned int flags __dparm(0));
4148-
/**
4149-
* @brief Gets a mipmap level of a HIP mipmapped array
4150-
*
4151-
* @param[out] levelArray - Returned mipmap level HIP array
4152-
* @param[in] mipmappedArray - HIP mipmapped array
4153-
* @param[in] level - Mipmap level
4154-
*
4155-
* @return #hipSuccess, #hipErrorInvalidValue
4156-
*/
4157-
hipError_t hipGetMipmappedArrayLevel(
4158-
hipArray_t *levelArray,
4159-
hipMipmappedArray_const_t mipmappedArray,
4160-
unsigned int level);
41614123
/**
41624124
* @brief Gets info about the specified array
41634125
*
@@ -5437,22 +5399,6 @@ hipError_t hipExtLaunchKernel(const void* function_address, dim3 numBlocks, dim3
54375399
* This section describes the texture management functions of HIP runtime API.
54385400
*/
54395401

5440-
/**
5441-
* @brief Binds a mipmapped array to a texture.
5442-
*
5443-
* @param [in] tex pointer to the texture reference to bind
5444-
* @param [in] mipmappedArray memory mipmapped array on the device
5445-
* @param [in] desc opointer to the channel format
5446-
*
5447-
* @returns #hipSuccess, #hipErrorInvalidValue
5448-
*
5449-
*/
5450-
DEPRECATED(DEPRECATED_MSG)
5451-
hipError_t hipBindTextureToMipmappedArray(
5452-
const textureReference* tex,
5453-
hipMipmappedArray_const_t mipmappedArray,
5454-
const hipChannelFormatDesc* desc);
5455-
54565402
/**
54575403
* @brief Creates a texture object.
54585404
*
@@ -5602,13 +5548,125 @@ hipError_t hipTexObjectGetTextureDesc(
56025548
HIP_TEXTURE_DESC* pTexDesc,
56035549
hipTextureObject_t texObject);
56045550

5551+
/**
5552+
* @brief Allocate a mipmapped array on the device.
5553+
*
5554+
* @param[out] mipmappedArray - Pointer to allocated mipmapped array in device memory
5555+
* @param[in] desc - Requested channel format
5556+
* @param[in] extent - Requested allocation size (width field in elements)
5557+
* @param[in] numLevels - Number of mipmap levels to allocate
5558+
* @param[in] flags - Flags for extensions
5559+
*
5560+
* @return #hipSuccess, #hipErrorInvalidValue, #hipErrorMemoryAllocation
5561+
*
5562+
* @note This API is implemented on Windows, under development on Linux.
5563+
*
5564+
*/
5565+
hipError_t hipMallocMipmappedArray(
5566+
hipMipmappedArray_t *mipmappedArray,
5567+
const struct hipChannelFormatDesc* desc,
5568+
struct hipExtent extent,
5569+
unsigned int numLevels,
5570+
unsigned int flags __dparm(0));
5571+
5572+
/**
5573+
* @brief Frees a mipmapped array on the device.
5574+
*
5575+
* @param[in] mipmappedArray - Pointer to mipmapped array to free
5576+
*
5577+
* @return #hipSuccess, #hipErrorInvalidValue
5578+
*
5579+
* @note This API is implemented on Windows, under development on Linux.
5580+
*
5581+
*/
5582+
hipError_t hipFreeMipmappedArray(hipMipmappedArray_t mipmappedArray);
5583+
5584+
/**
5585+
* @brief Gets a mipmap level of a HIP mipmapped array.
5586+
*
5587+
* @param[out] levelArray - Returned mipmap level HIP array
5588+
* @param[in] mipmappedArray - HIP mipmapped array
5589+
* @param[in] level - Mipmap level
5590+
*
5591+
* @return #hipSuccess, #hipErrorInvalidValue
5592+
*
5593+
* @note This API is implemented on Windows, under development on Linux.
5594+
*
5595+
*/
5596+
hipError_t hipGetMipmappedArrayLevel(
5597+
hipArray_t *levelArray,
5598+
hipMipmappedArray_const_t mipmappedArray,
5599+
unsigned int level);
5600+
5601+
/**
5602+
* @brief Create a mipmapped array.
5603+
*
5604+
* @param [out] pHandle pointer to mipmapped array
5605+
* @param [in] pMipmappedArrayDesc mipmapped array descriptor
5606+
* @param [in] numMipmapLevels mipmap level
5607+
*
5608+
* @returns #hipSuccess, #hipErrorNotSupported, #hipErrorInvalidValue
5609+
*
5610+
* @note This API is implemented on Windows, under development on Linux.
5611+
*/
5612+
hipError_t hipMipmappedArrayCreate(
5613+
hipMipmappedArray_t* pHandle,
5614+
HIP_ARRAY3D_DESCRIPTOR* pMipmappedArrayDesc,
5615+
unsigned int numMipmapLevels);
5616+
5617+
/**
5618+
* @brief Destroy a mipmapped array.
5619+
*
5620+
* @param [out] hMipmappedArray pointer to mipmapped array to destroy
5621+
*
5622+
* @returns #hipSuccess, #hipErrorInvalidValue
5623+
*
5624+
* @note This API is implemented on Windows, under development on Linux.
5625+
*
5626+
*/
5627+
hipError_t hipMipmappedArrayDestroy(hipMipmappedArray_t hMipmappedArray);
5628+
5629+
/**
5630+
* @brief Get a mipmapped array on a mipmapped level.
5631+
*
5632+
* @param [in] pLevelArray Pointer of array
5633+
* @param [out] hMipMappedArray Pointer of mipmapped array on the requested mipmap level
5634+
* @param [out] level Mipmap level
5635+
*
5636+
* @returns #hipSuccess, #hipErrorInvalidValue
5637+
*
5638+
* @note This API is implemented on Windows, under development on Linux.
5639+
*
5640+
*/
5641+
hipError_t hipMipmappedArrayGetLevel(
5642+
hipArray_t* pLevelArray,
5643+
hipMipmappedArray_t hMipMappedArray,
5644+
unsigned int level);
5645+
56055646
/**
56065647
*
56075648
* @addtogroup TextureD Texture Management [Deprecated]
56085649
* @{
56095650
* @ingroup Texture
56105651
* This section describes the deprecated texture management functions of HIP runtime API.
56115652
*/
5653+
5654+
/**
5655+
* @brief Binds a mipmapped array to a texture.
5656+
*
5657+
* @param [in] tex pointer to the texture reference to bind
5658+
* @param [in] mipmappedArray memory mipmapped array on the device
5659+
* @param [in] desc opointer to the channel format
5660+
*
5661+
* @returns #hipSuccess, #hipErrorInvalidValue
5662+
*
5663+
*/
5664+
DEPRECATED(DEPRECATED_MSG)
5665+
hipError_t hipBindTextureToMipmappedArray(
5666+
const textureReference* tex,
5667+
hipMipmappedArray_const_t mipmappedArray,
5668+
const hipChannelFormatDesc* desc);
5669+
56125670
/**
56135671
* @brief Gets the texture reference related with the symbol.
56145672
*
@@ -5878,7 +5936,6 @@ DEPRECATED(DEPRECATED_MSG)
58785936
hipError_t hipTexRefGetMipmapFilterMode(
58795937
enum hipTextureFilterMode* pfm,
58805938
const textureReference* texRef);
5881-
DEPRECATED(DEPRECATED_MSG)
58825939
/**
58835940
* @brief Gets the mipmap level bias for a texture reference.
58845941
*
@@ -5888,6 +5945,7 @@ DEPRECATED(DEPRECATED_MSG)
58885945
* @warning This API is deprecated.
58895946
*
58905947
*/
5948+
DEPRECATED(DEPRECATED_MSG)
58915949
hipError_t hipTexRefGetMipmapLevelBias(
58925950
float* pbias,
58935951
const textureReference* texRef);
@@ -6036,53 +6094,6 @@ hipError_t hipTexRefSetMipmappedArray(
60366094
struct hipMipmappedArray* mipmappedArray,
60376095
unsigned int Flags);
60386096

6039-
/**
6040-
*
6041-
* @addtogroup TextureU Texture Management [Not supported]
6042-
* @{
6043-
* @ingroup Texture
6044-
* This section describes the texture management functions currently unsupported in HIP runtime.
6045-
*/
6046-
/**
6047-
* @brief Create a mipmapped array.
6048-
*
6049-
* @param [out] pHandle pointer to mipmapped array
6050-
* @param [in] pMipmappedArrayDesc mipmapped array descriptor
6051-
* @param [in] numMipmapLevels mipmap level
6052-
*
6053-
* @returns #hipSuccess, #hipErrorNotSupported, #hipErrorInvalidValue
6054-
*
6055-
*/
6056-
DEPRECATED(DEPRECATED_MSG)
6057-
hipError_t hipMipmappedArrayCreate(
6058-
hipMipmappedArray_t* pHandle,
6059-
HIP_ARRAY3D_DESCRIPTOR* pMipmappedArrayDesc,
6060-
unsigned int numMipmapLevels);
6061-
/**
6062-
* @brief Destroy a mipmapped array.
6063-
*
6064-
* @param [out] hMipmappedArray pointer to mipmapped array to destroy
6065-
*
6066-
* @returns #hipSuccess, #hipErrorInvalidValue
6067-
*
6068-
*/
6069-
DEPRECATED(DEPRECATED_MSG)
6070-
hipError_t hipMipmappedArrayDestroy(hipMipmappedArray_t hMipmappedArray);
6071-
/**
6072-
* @brief Get a mipmapped array on a mipmapped level.
6073-
*
6074-
* @param [in] pLevelArray Pointer of array
6075-
* @param [out] hMipMappedArray Pointer of mipmapped array on the requested mipmap level
6076-
* @param [out] level Mipmap level
6077-
*
6078-
* @returns #hipSuccess, #hipErrorInvalidValue
6079-
*
6080-
*/
6081-
DEPRECATED(DEPRECATED_MSG)
6082-
hipError_t hipMipmappedArrayGetLevel(
6083-
hipArray_t* pLevelArray,
6084-
hipMipmappedArray_t hMipMappedArray,
6085-
unsigned int level);
60866097
// doxygen end deprecated texture management
60876098
/**
60886099
* @}

0 commit comments

Comments
 (0)