Skip to content

Commit 2ee83ed

Browse files
aarongreigaarongreig
committed
Fix Coverity issue: dead code in bindless image validation.
1 parent 7b96d40 commit 2ee83ed

File tree

8 files changed

+22
-36
lines changed

8 files changed

+22
-36
lines changed

‎include/ur_api.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6366,23 +6366,21 @@ urBindlessImagesImageCopyExp(
63666366
/// + `NULL == hImageMem`
63676367
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
63686368
/// + `::UR_IMAGE_INFO_DEPTH < propName`
6369-
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
6370-
/// + `NULL == pPropValue`
6371-
/// + `NULL == pPropSizeRet`
6372-
/// + `pPropValue == NULL && pPropSizeRet == NULL`
63736369
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
63746370
/// + If `propName` is not supported by the adapter.
63756371
/// - ::UR_RESULT_ERROR_INVALID_SIZE
63766372
/// + If `propSize` is less than the real number of bytes needed to return the info.
6373+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
6374+
/// + `pPropValue == NULL && pPropSizeRet == NULL`
63776375
/// - ::UR_RESULT_ERROR_INVALID_DEVICE
63786376
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
63796377
/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
63806378
UR_APIEXPORT ur_result_t UR_APICALL
63816379
urBindlessImagesImageGetInfoExp(
63826380
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
63836381
ur_image_info_t propName, ///< [in] queried info name
6384-
void *pPropValue, ///< [out] returned query value
6385-
size_t *pPropSizeRet ///< [out] returned query value size
6382+
void *pPropValue, ///< [out][optional] returned query value
6383+
size_t *pPropSizeRet ///< [out][optional] returned query value size
63866384
);
63876385

63886386
///////////////////////////////////////////////////////////////////////////////

‎scripts/core/exp-bindless-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,10 @@ params:
329329
desc: "[in] queried info name"
330330
- type: void*
331331
name: pPropValue
332-
desc: "[out] returned query value"
332+
desc: "[out][optional] returned query value"
333333
- type: "size_t*"
334334
name: pPropSizeRet
335-
desc: "[out] returned query value size"
335+
desc: "[out][optional] returned query value size"
336336
returns:
337337
- $X_RESULT_ERROR_UNSUPPORTED_ENUMERATION:
338338
- "If `propName` is not supported by the adapter."

‎source/adapters/null/ur_nullddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3740,8 +3740,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
37403740
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
37413741
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
37423742
ur_image_info_t propName, ///< [in] queried info name
3743-
void *pPropValue, ///< [out] returned query value
3744-
size_t *pPropSizeRet ///< [out] returned query value size
3743+
void *pPropValue, ///< [out][optional] returned query value
3744+
size_t *pPropSizeRet ///< [out][optional] returned query value size
37453745
) try {
37463746
ur_result_t result = UR_RESULT_SUCCESS;
37473747

‎source/loader/layers/tracing/ur_trcddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4246,8 +4246,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
42464246
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
42474247
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
42484248
ur_image_info_t propName, ///< [in] queried info name
4249-
void *pPropValue, ///< [out] returned query value
4250-
size_t *pPropSizeRet ///< [out] returned query value size
4249+
void *pPropValue, ///< [out][optional] returned query value
4250+
size_t *pPropSizeRet ///< [out][optional] returned query value size
42514251
) {
42524252
auto pfnImageGetInfoExp =
42534253
context.urDdiTable.BindlessImagesExp.pfnImageGetInfoExp;

‎source/loader/layers/validation/ur_valddi.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5396,8 +5396,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
53965396
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
53975397
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
53985398
ur_image_info_t propName, ///< [in] queried info name
5399-
void *pPropValue, ///< [out] returned query value
5400-
size_t *pPropSizeRet ///< [out] returned query value size
5399+
void *pPropValue, ///< [out][optional] returned query value
5400+
size_t *pPropSizeRet ///< [out][optional] returned query value size
54015401
) {
54025402
auto pfnImageGetInfoExp =
54035403
context.urDdiTable.BindlessImagesExp.pfnImageGetInfoExp;
@@ -5411,14 +5411,6 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
54115411
return UR_RESULT_ERROR_INVALID_NULL_HANDLE;
54125412
}
54135413

5414-
if (NULL == pPropValue) {
5415-
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
5416-
}
5417-
5418-
if (NULL == pPropSizeRet) {
5419-
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
5420-
}
5421-
54225414
if (pPropValue == NULL && pPropSizeRet == NULL) {
54235415
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
54245416
}

‎source/loader/ur_ldrddi.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5234,8 +5234,8 @@ __urdlllocal ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
52345234
__urdlllocal ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
52355235
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
52365236
ur_image_info_t propName, ///< [in] queried info name
5237-
void *pPropValue, ///< [out] returned query value
5238-
size_t *pPropSizeRet ///< [out] returned query value size
5237+
void *pPropValue, ///< [out][optional] returned query value
5238+
size_t *pPropSizeRet ///< [out][optional] returned query value size
52395239
) {
52405240
ur_result_t result = UR_RESULT_SUCCESS;
52415241

‎source/loader/ur_libapi.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5649,22 +5649,20 @@ ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
56495649
/// + `NULL == hImageMem`
56505650
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
56515651
/// + `::UR_IMAGE_INFO_DEPTH < propName`
5652-
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
5653-
/// + `NULL == pPropValue`
5654-
/// + `NULL == pPropSizeRet`
5655-
/// + `pPropValue == NULL && pPropSizeRet == NULL`
56565652
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
56575653
/// + If `propName` is not supported by the adapter.
56585654
/// - ::UR_RESULT_ERROR_INVALID_SIZE
56595655
/// + If `propSize` is less than the real number of bytes needed to return the info.
5656+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
5657+
/// + `pPropValue == NULL && pPropSizeRet == NULL`
56605658
/// - ::UR_RESULT_ERROR_INVALID_DEVICE
56615659
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
56625660
/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
56635661
ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
56645662
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
56655663
ur_image_info_t propName, ///< [in] queried info name
5666-
void *pPropValue, ///< [out] returned query value
5667-
size_t *pPropSizeRet ///< [out] returned query value size
5664+
void *pPropValue, ///< [out][optional] returned query value
5665+
size_t *pPropSizeRet ///< [out][optional] returned query value size
56685666
) try {
56695667
auto pfnImageGetInfoExp =
56705668
ur_lib::context->urDdiTable.BindlessImagesExp.pfnImageGetInfoExp;

‎source/ur_api.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4758,22 +4758,20 @@ ur_result_t UR_APICALL urBindlessImagesImageCopyExp(
47584758
/// + `NULL == hImageMem`
47594759
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
47604760
/// + `::UR_IMAGE_INFO_DEPTH < propName`
4761-
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
4762-
/// + `NULL == pPropValue`
4763-
/// + `NULL == pPropSizeRet`
4764-
/// + `pPropValue == NULL && pPropSizeRet == NULL`
47654761
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
47664762
/// + If `propName` is not supported by the adapter.
47674763
/// - ::UR_RESULT_ERROR_INVALID_SIZE
47684764
/// + If `propSize` is less than the real number of bytes needed to return the info.
4765+
/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
4766+
/// + `pPropValue == NULL && pPropSizeRet == NULL`
47694767
/// - ::UR_RESULT_ERROR_INVALID_DEVICE
47704768
/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
47714769
/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
47724770
ur_result_t UR_APICALL urBindlessImagesImageGetInfoExp(
47734771
ur_exp_image_mem_handle_t hImageMem, ///< [in] handle to the image memory
47744772
ur_image_info_t propName, ///< [in] queried info name
4775-
void *pPropValue, ///< [out] returned query value
4776-
size_t *pPropSizeRet ///< [out] returned query value size
4773+
void *pPropValue, ///< [out][optional] returned query value
4774+
size_t *pPropSizeRet ///< [out][optional] returned query value size
47774775
) {
47784776
ur_result_t result = UR_RESULT_SUCCESS;
47794777
return result;

0 commit comments

Comments
 (0)