replace array designator C99 (#1694)

* replace array designator C99

* Update texture_functions.h

Highlight valid and invalid values in texFormatToSize

Co-authored-by: Maneesh Gupta <maneesh.gupta@amd.com>


[ROCm/clr commit: 32625638da]
Цей коміт міститься в:
Maneesh Gupta
2019-12-23 19:10:24 +05:30
зафіксовано GitHub
джерело 47725baf8c 35e4141eab
коміт 36b23663e0
+14 -12
Переглянути файл
@@ -157,8 +157,6 @@ union TData {
#define TEXTURE_RETURN_UINT_XYZW return make_uint4(texel.u.x, texel.u.y, texel.u.z, texel.u.w);
#define HIP_AD_FORMAT_NOT_INITIALIZED 0
#define TEXTURE_RETURN_FLOAT return (texFormatToSize[texRef.format] == 1)? texel.f.x : (float)texel.u.x/texFormatToSize[texRef.format];
#define TEXTURE_RETURN_FLOAT_X return (texFormatToSize[texRef.format] == 1)? make_float1(texel.f.x) : make_float1((float)texel.u.x/texFormatToSize[texRef.format]);
@@ -169,16 +167,20 @@ union TData {
extern "C" {
__device__ __constant__ static int texFormatToSize[] = {
[HIP_AD_FORMAT_NOT_INITIALIZED] = 1 ,
[HIP_AD_FORMAT_UNSIGNED_INT8] = UCHAR_MAX ,
[HIP_AD_FORMAT_UNSIGNED_INT16]= USHRT_MAX,
[HIP_AD_FORMAT_UNSIGNED_INT32]= 1 ,
[HIP_AD_FORMAT_SIGNED_INT8] = SCHAR_MAX,
[HIP_AD_FORMAT_SIGNED_INT16] = SHRT_MAX,
[HIP_AD_FORMAT_SIGNED_INT32] = 1 ,
[HIP_AD_FORMAT_HALF] = 1 ,
[HIP_AD_FORMAT_FLOAT] = 1
// this is really a sparse array with only valid values being the ones indexed by the enum hipArray_Format(e.g. texFormatToSize[HIP_AD_FORMAT_UNSIGNED_INT8] = UCHAR_MAX)
__device__ __constant__ static int texFormatToSize[] = {
1, /* HIP_AD_FORMAT_NOT_INITIALIZED */
UCHAR_MAX, /* HIP_AD_FORMAT_UNSIGNED_INT8 */
USHRT_MAX, /* HIP_AD_FORMAT_UNSIGNED_INT16 */
1, /* HIP_AD_FORMAT_UNSIGNED_INT32 */
1,1,1,1, /* Invalid values */
SCHAR_MAX, /* HIP_AD_FORMAT_SIGNED_INT8 */
SHRT_MAX, /* HIP_AD_FORMAT_SIGNED_INT16 */
1, /* HIP_AD_FORMAT_SIGNED_INT32 */
1,1,1,1,1, /* Invalid values */
1, /* HIP_AD_FORMAT_HALF */
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* Invalid values */
1 /* HIP_AD_FORMAT_FLOAT */
};
__device__