SWDEV-332969 - [ABI Break] Change hipArray* with hipArray_t
Signed-off-by: sdashmiz <shadi.dashmiz@amd.com>
Change-Id: Ia0897362f7f2be29a0c7580a9db70ea02cf56670
[ROCm/hip commit: 41bfc32e09]
Этот коммит содержится в:
sdashmiz
коммит произвёл
Shadi Dashmiz
Shadi Dashmiz
родитель
f6a1ad4ca1
Коммит
12726ee23b
@@ -57,6 +57,9 @@ typedef struct hipChannelFormatDesc {
|
||||
#define HIP_TRSF_READ_AS_INTEGER 0x01
|
||||
#define HIP_TRSF_NORMALIZED_COORDINATES 0x02
|
||||
#define HIP_TRSF_SRGB 0x10
|
||||
|
||||
typedef struct hipArray* hipArray_t;
|
||||
typedef const struct hipArray* hipArray_const_t;
|
||||
typedef enum hipArray_Format {
|
||||
HIP_AD_FORMAT_UNSIGNED_INT8 = 0x01,
|
||||
HIP_AD_FORMAT_UNSIGNED_INT16 = 0x02,
|
||||
@@ -81,19 +84,6 @@ typedef struct HIP_ARRAY3D_DESCRIPTOR {
|
||||
unsigned int NumChannels;
|
||||
unsigned int Flags;
|
||||
}HIP_ARRAY3D_DESCRIPTOR;
|
||||
typedef struct hipArray {
|
||||
void* data; // FIXME: generalize this
|
||||
struct hipChannelFormatDesc desc;
|
||||
unsigned int type;
|
||||
unsigned int width;
|
||||
unsigned int height;
|
||||
unsigned int depth;
|
||||
enum hipArray_Format Format;
|
||||
unsigned int NumChannels;
|
||||
bool isDrv;
|
||||
unsigned int textureType;
|
||||
unsigned int flags;
|
||||
}hipArray;
|
||||
#if !defined(__HIPCC_RTC__)
|
||||
typedef struct hip_Memcpy2D {
|
||||
size_t srcXInBytes;
|
||||
@@ -101,22 +91,19 @@ typedef struct hip_Memcpy2D {
|
||||
hipMemoryType srcMemoryType;
|
||||
const void* srcHost;
|
||||
hipDeviceptr_t srcDevice;
|
||||
hipArray* srcArray;
|
||||
hipArray_t srcArray;
|
||||
size_t srcPitch;
|
||||
size_t dstXInBytes;
|
||||
size_t dstY;
|
||||
hipMemoryType dstMemoryType;
|
||||
void* dstHost;
|
||||
hipDeviceptr_t dstDevice;
|
||||
hipArray* dstArray;
|
||||
hipArray_t dstArray;
|
||||
size_t dstPitch;
|
||||
size_t WidthInBytes;
|
||||
size_t Height;
|
||||
} hip_Memcpy2D;
|
||||
#endif // !defined(__HIPCC_RTC__)
|
||||
typedef struct hipArray* hipArray_t;
|
||||
typedef hipArray_t hiparray;
|
||||
typedef const struct hipArray* hipArray_const_t;
|
||||
typedef struct hipMipmappedArray {
|
||||
void* data;
|
||||
struct hipChannelFormatDesc desc;
|
||||
|
||||
@@ -4213,7 +4213,7 @@ hipError_t hipMemPtrGetInfo(void* ptr, size_t* size);
|
||||
*
|
||||
* @see hipMalloc, hipMallocPitch, hipFree, hipFreeArray, hipHostMalloc, hipHostFree
|
||||
*/
|
||||
hipError_t hipMallocArray(hipArray** array, const hipChannelFormatDesc* desc, size_t width,
|
||||
hipError_t hipMallocArray(hipArray_t* array, const hipChannelFormatDesc* desc, size_t width,
|
||||
size_t height __dparm(0), unsigned int flags __dparm(hipArrayDefault));
|
||||
/**
|
||||
* @brief Create an array memory pointer on the device.
|
||||
@@ -4225,7 +4225,7 @@ hipError_t hipMallocArray(hipArray** array, const hipChannelFormatDesc* desc, si
|
||||
*
|
||||
* @see hipMallocArray, hipArrayDestroy, hipFreeArray
|
||||
*/
|
||||
hipError_t hipArrayCreate(hipArray** pHandle, const HIP_ARRAY_DESCRIPTOR* pAllocateArray);
|
||||
hipError_t hipArrayCreate(hipArray_t* pHandle, const HIP_ARRAY_DESCRIPTOR* pAllocateArray);
|
||||
/**
|
||||
* @brief Destroy an array memory pointer on the device.
|
||||
*
|
||||
@@ -4235,7 +4235,7 @@ hipError_t hipArrayCreate(hipArray** pHandle, const HIP_ARRAY_DESCRIPTOR* pAlloc
|
||||
*
|
||||
* @see hipArrayCreate, hipArrayDestroy, hipFreeArray
|
||||
*/
|
||||
hipError_t hipArrayDestroy(hipArray* array);
|
||||
hipError_t hipArrayDestroy(hipArray_t array);
|
||||
/**
|
||||
* @brief Create a 3D array memory pointer on the device.
|
||||
*
|
||||
@@ -4246,7 +4246,7 @@ hipError_t hipArrayDestroy(hipArray* array);
|
||||
*
|
||||
* @see hipMallocArray, hipArrayDestroy, hipFreeArray
|
||||
*/
|
||||
hipError_t hipArray3DCreate(hipArray** array, const HIP_ARRAY3D_DESCRIPTOR* pAllocateArray);
|
||||
hipError_t hipArray3DCreate(hipArray_t* array, const HIP_ARRAY3D_DESCRIPTOR* pAllocateArray);
|
||||
/**
|
||||
* @brief Create a 3D memory pointer on the device.
|
||||
*
|
||||
@@ -4266,7 +4266,7 @@ hipError_t hipMalloc3D(hipPitchedPtr* pitchedDevPtr, hipExtent extent);
|
||||
*
|
||||
* @see hipMalloc, hipMallocPitch, hipFree, hipMallocArray, hipHostMalloc, hipHostFree
|
||||
*/
|
||||
hipError_t hipFreeArray(hipArray* array);
|
||||
hipError_t hipFreeArray(hipArray_t array);
|
||||
/**
|
||||
* @brief Allocate an array on the device.
|
||||
*
|
||||
@@ -4278,7 +4278,7 @@ hipError_t hipFreeArray(hipArray* array);
|
||||
*
|
||||
* @see hipMalloc, hipMallocPitch, hipFree, hipFreeArray, hipHostMalloc, hipHostFree
|
||||
*/
|
||||
hipError_t hipMalloc3DArray(hipArray** array, const struct hipChannelFormatDesc* desc,
|
||||
hipError_t hipMalloc3DArray(hipArray_t* array, const struct hipChannelFormatDesc* desc,
|
||||
struct hipExtent extent, unsigned int flags);
|
||||
/**
|
||||
* @brief Gets info about the specified array
|
||||
@@ -4293,7 +4293,7 @@ hipError_t hipMalloc3DArray(hipArray** array, const struct hipChannelFormatDesc*
|
||||
* @see hipArrayGetDescriptor, hipArray3DGetDescriptor
|
||||
*/
|
||||
hipError_t hipArrayGetInfo(hipChannelFormatDesc* desc, hipExtent* extent, unsigned int* flags,
|
||||
hipArray* array);
|
||||
hipArray_t array);
|
||||
/**
|
||||
* @brief Gets a 1D or 2D array descriptor
|
||||
*
|
||||
@@ -4311,7 +4311,7 @@ hipError_t hipArrayGetInfo(hipChannelFormatDesc* desc, hipExtent* extent, unsign
|
||||
* hipMemFreeHost, hipMemGetAddressRange, hipMemGetInfo, hipMemHostAlloc,
|
||||
* hipMemHostGetDevicePointer, hipMemsetD8, hipMemsetD16, hipMemsetD32, hipArrayGetInfo
|
||||
*/
|
||||
hipError_t hipArrayGetDescriptor(HIP_ARRAY_DESCRIPTOR* pArrayDescriptor, hipArray* array);
|
||||
hipError_t hipArrayGetDescriptor(HIP_ARRAY_DESCRIPTOR* pArrayDescriptor, hipArray_t array);
|
||||
/**
|
||||
* @brief Gets a 3D array descriptor
|
||||
*
|
||||
@@ -4329,7 +4329,7 @@ hipError_t hipArrayGetDescriptor(HIP_ARRAY_DESCRIPTOR* pArrayDescriptor, hipArra
|
||||
* hipMemFreeHost, hipMemGetAddressRange, hipMemGetInfo, hipMemHostAlloc,
|
||||
* hipMemHostGetDevicePointer, hipMemsetD8, hipMemsetD16, hipMemsetD32, hipArrayGetInfo
|
||||
*/
|
||||
hipError_t hipArray3DGetDescriptor(HIP_ARRAY3D_DESCRIPTOR* pArrayDescriptor, hipArray* array);
|
||||
hipError_t hipArray3DGetDescriptor(HIP_ARRAY3D_DESCRIPTOR* pArrayDescriptor, hipArray_t array);
|
||||
/**
|
||||
* @brief Copies data between host and device.
|
||||
*
|
||||
@@ -4405,7 +4405,7 @@ hipError_t hipMemcpy2DAsync(void* dst, size_t dpitch, const void* src, size_t sp
|
||||
* @see hipMemcpy, hipMemcpyToArray, hipMemcpy2D, hipMemcpyFromArray, hipMemcpyToSymbol,
|
||||
* hipMemcpyAsync
|
||||
*/
|
||||
hipError_t hipMemcpy2DToArray(hipArray* dst, size_t wOffset, size_t hOffset, const void* src,
|
||||
hipError_t hipMemcpy2DToArray(hipArray_t dst, size_t wOffset, size_t hOffset, const void* src,
|
||||
size_t spitch, size_t width, size_t height, hipMemcpyKind kind);
|
||||
/**
|
||||
* @brief Copies data between host and device.
|
||||
@@ -4425,7 +4425,7 @@ hipError_t hipMemcpy2DToArray(hipArray* dst, size_t wOffset, size_t hOffset, con
|
||||
* @see hipMemcpy, hipMemcpyToArray, hipMemcpy2D, hipMemcpyFromArray, hipMemcpyToSymbol,
|
||||
* hipMemcpyAsync
|
||||
*/
|
||||
hipError_t hipMemcpy2DToArrayAsync(hipArray* dst, size_t wOffset, size_t hOffset, const void* src,
|
||||
hipError_t hipMemcpy2DToArrayAsync(hipArray_t dst, size_t wOffset, size_t hOffset, const void* src,
|
||||
size_t spitch, size_t width, size_t height, hipMemcpyKind kind,
|
||||
hipStream_t stream __dparm(0));
|
||||
/**
|
||||
@@ -4445,7 +4445,7 @@ hipError_t hipMemcpy2DToArrayAsync(hipArray* dst, size_t wOffset, size_t hOffset
|
||||
* @warning This API is deprecated.
|
||||
*/
|
||||
DEPRECATED(DEPRECATED_MSG)
|
||||
hipError_t hipMemcpyToArray(hipArray* dst, size_t wOffset, size_t hOffset, const void* src,
|
||||
hipError_t hipMemcpyToArray(hipArray_t dst, size_t wOffset, size_t hOffset, const void* src,
|
||||
size_t count, hipMemcpyKind kind);
|
||||
/**
|
||||
* @brief Copies data between host and device.
|
||||
@@ -4516,7 +4516,7 @@ hipError_t hipMemcpy2DFromArrayAsync( void* dst, size_t dpitch, hipArray_const_t
|
||||
* @see hipMemcpy, hipMemcpy2DToArray, hipMemcpy2D, hipMemcpyFromArray, hipMemcpyToSymbol,
|
||||
* hipMemcpyAsync
|
||||
*/
|
||||
hipError_t hipMemcpyAtoH(void* dst, hipArray* srcArray, size_t srcOffset, size_t count);
|
||||
hipError_t hipMemcpyAtoH(void* dst, hipArray_t srcArray, size_t srcOffset, size_t count);
|
||||
/**
|
||||
* @brief Copies data between host and device.
|
||||
*
|
||||
@@ -4530,7 +4530,7 @@ hipError_t hipMemcpyAtoH(void* dst, hipArray* srcArray, size_t srcOffset, size_t
|
||||
* @see hipMemcpy, hipMemcpy2DToArray, hipMemcpy2D, hipMemcpyFromArray, hipMemcpyToSymbol,
|
||||
* hipMemcpyAsync
|
||||
*/
|
||||
hipError_t hipMemcpyHtoA(hipArray* dstArray, size_t dstOffset, const void* srcHost, size_t count);
|
||||
hipError_t hipMemcpyHtoA(hipArray_t dstArray, size_t dstOffset, const void* srcHost, size_t count);
|
||||
/**
|
||||
* @brief Copies data between host and device.
|
||||
*
|
||||
|
||||
Ссылка в новой задаче
Block a user