Skip to content

Commit 572c22f

Browse files
Seanst98DBDuncan
Seanst98
authored and
DBDuncan
committed
[Bindless][Exp] Rename interop related structs/funcs with "external"
Rename interop related structs, functions, and enums with the "external" keyword over "interop".
1 parent 3fc52b2 commit 572c22f

35 files changed

+620
-600
lines changed

‎include/ur_api.h‎

Lines changed: 117 additions & 117 deletions
Large diffs are not rendered by default.

‎include/ur_ddi.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1626,8 +1626,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalMemoryExp_t)(
16261626
ur_device_handle_t,
16271627
size_t,
16281628
ur_exp_external_mem_type_t,
1629-
ur_exp_interop_mem_desc_t *,
1630-
ur_exp_interop_mem_handle_t *);
1629+
ur_exp_external_mem_desc_t *,
1630+
ur_exp_external_mem_handle_t *);
16311631

16321632
///////////////////////////////////////////////////////////////////////////////
16331633
/// @brief Function-pointer for urBindlessImagesMapExternalArrayExp
@@ -1636,37 +1636,37 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesMapExternalArrayExp_t)(
16361636
ur_device_handle_t,
16371637
const ur_image_format_t *,
16381638
const ur_image_desc_t *,
1639-
ur_exp_interop_mem_handle_t,
1639+
ur_exp_external_mem_handle_t,
16401640
ur_exp_image_mem_native_handle_t *);
16411641

16421642
///////////////////////////////////////////////////////////////////////////////
1643-
/// @brief Function-pointer for urBindlessImagesReleaseInteropExp
1644-
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesReleaseInteropExp_t)(
1643+
/// @brief Function-pointer for urBindlessImagesReleaseExternalMemoryExp
1644+
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesReleaseExternalMemoryExp_t)(
16451645
ur_context_handle_t,
16461646
ur_device_handle_t,
1647-
ur_exp_interop_mem_handle_t);
1647+
ur_exp_external_mem_handle_t);
16481648

16491649
///////////////////////////////////////////////////////////////////////////////
16501650
/// @brief Function-pointer for urBindlessImagesImportExternalSemaphoreExp
16511651
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesImportExternalSemaphoreExp_t)(
16521652
ur_context_handle_t,
16531653
ur_device_handle_t,
16541654
ur_exp_external_semaphore_type_t,
1655-
ur_exp_interop_semaphore_desc_t *,
1656-
ur_exp_interop_semaphore_handle_t *);
1655+
ur_exp_external_semaphore_desc_t *,
1656+
ur_exp_external_semaphore_handle_t *);
16571657

16581658
///////////////////////////////////////////////////////////////////////////////
16591659
/// @brief Function-pointer for urBindlessImagesReleaseExternalSemaphoreExp
16601660
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesReleaseExternalSemaphoreExp_t)(
16611661
ur_context_handle_t,
16621662
ur_device_handle_t,
1663-
ur_exp_interop_semaphore_handle_t);
1663+
ur_exp_external_semaphore_handle_t);
16641664

16651665
///////////////////////////////////////////////////////////////////////////////
16661666
/// @brief Function-pointer for urBindlessImagesWaitExternalSemaphoreExp
16671667
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesWaitExternalSemaphoreExp_t)(
16681668
ur_queue_handle_t,
1669-
ur_exp_interop_semaphore_handle_t,
1669+
ur_exp_external_semaphore_handle_t,
16701670
bool,
16711671
uint64_t,
16721672
uint32_t,
@@ -1677,7 +1677,7 @@ typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesWaitExternalSemaphoreExp_t)(
16771677
/// @brief Function-pointer for urBindlessImagesSignalExternalSemaphoreExp
16781678
typedef ur_result_t(UR_APICALL *ur_pfnBindlessImagesSignalExternalSemaphoreExp_t)(
16791679
ur_queue_handle_t,
1680-
ur_exp_interop_semaphore_handle_t,
1680+
ur_exp_external_semaphore_handle_t,
16811681
bool,
16821682
uint64_t,
16831683
uint32_t,
@@ -1699,7 +1699,7 @@ typedef struct ur_bindless_images_exp_dditable_t {
16991699
ur_pfnBindlessImagesMipmapFreeExp_t pfnMipmapFreeExp;
17001700
ur_pfnBindlessImagesImportExternalMemoryExp_t pfnImportExternalMemoryExp;
17011701
ur_pfnBindlessImagesMapExternalArrayExp_t pfnMapExternalArrayExp;
1702-
ur_pfnBindlessImagesReleaseInteropExp_t pfnReleaseInteropExp;
1702+
ur_pfnBindlessImagesReleaseExternalMemoryExp_t pfnReleaseExternalMemoryExp;
17031703
ur_pfnBindlessImagesImportExternalSemaphoreExp_t pfnImportExternalSemaphoreExp;
17041704
ur_pfnBindlessImagesReleaseExternalSemaphoreExp_t pfnReleaseExternalSemaphoreExp;
17051705
ur_pfnBindlessImagesWaitExternalSemaphoreExp_t pfnWaitExternalSemaphoreExp;

‎include/ur_print.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -947,20 +947,20 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintExpSamplerAddrModes(const struct ur_e
947947
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpSamplerCubemapProperties(const struct ur_exp_sampler_cubemap_properties_t params, char *buffer, const size_t buff_size, size_t *out_size);
948948

949949
///////////////////////////////////////////////////////////////////////////////
950-
/// @brief Print ur_exp_interop_mem_desc_t struct
950+
/// @brief Print ur_exp_external_mem_desc_t struct
951951
/// @returns
952952
/// - ::UR_RESULT_SUCCESS
953953
/// - ::UR_RESULT_ERROR_INVALID_SIZE
954954
/// - `buff_size < out_size`
955-
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpInteropMemDesc(const struct ur_exp_interop_mem_desc_t params, char *buffer, const size_t buff_size, size_t *out_size);
955+
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpExternalMemDesc(const struct ur_exp_external_mem_desc_t params, char *buffer, const size_t buff_size, size_t *out_size);
956956

957957
///////////////////////////////////////////////////////////////////////////////
958-
/// @brief Print ur_exp_interop_semaphore_desc_t struct
958+
/// @brief Print ur_exp_external_semaphore_desc_t struct
959959
/// @returns
960960
/// - ::UR_RESULT_SUCCESS
961961
/// - ::UR_RESULT_ERROR_INVALID_SIZE
962962
/// - `buff_size < out_size`
963-
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpInteropSemaphoreDesc(const struct ur_exp_interop_semaphore_desc_t params, char *buffer, const size_t buff_size, size_t *out_size);
963+
UR_APIEXPORT ur_result_t UR_APICALL urPrintExpExternalSemaphoreDesc(const struct ur_exp_external_semaphore_desc_t params, char *buffer, const size_t buff_size, size_t *out_size);
964964

965965
///////////////////////////////////////////////////////////////////////////////
966966
/// @brief Print ur_exp_image_copy_region_t struct
@@ -2147,12 +2147,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesImportExternalMemoryExp
21472147
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesMapExternalArrayExpParams(const struct ur_bindless_images_map_external_array_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
21482148

21492149
///////////////////////////////////////////////////////////////////////////////
2150-
/// @brief Print ur_bindless_images_release_interop_exp_params_t struct
2150+
/// @brief Print ur_bindless_images_release_external_memory_exp_params_t struct
21512151
/// @returns
21522152
/// - ::UR_RESULT_SUCCESS
21532153
/// - ::UR_RESULT_ERROR_INVALID_SIZE
21542154
/// - `buff_size < out_size`
2155-
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesReleaseInteropExpParams(const struct ur_bindless_images_release_interop_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
2155+
UR_APIEXPORT ur_result_t UR_APICALL urPrintBindlessImagesReleaseExternalMemoryExpParams(const struct ur_bindless_images_release_external_memory_exp_params_t *params, char *buffer, const size_t buff_size, size_t *out_size);
21562156

21572157
///////////////////////////////////////////////////////////////////////////////
21582158
/// @brief Print ur_bindless_images_import_external_semaphore_exp_params_t struct

‎include/ur_print.hpp‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ struct is_handle<ur_physical_mem_handle_t> : std::true_type {};
4747
template <>
4848
struct is_handle<ur_usm_pool_handle_t> : std::true_type {};
4949
template <>
50-
struct is_handle<ur_exp_interop_mem_handle_t> : std::true_type {};
50+
struct is_handle<ur_exp_external_mem_handle_t> : std::true_type {};
5151
template <>
52-
struct is_handle<ur_exp_interop_semaphore_handle_t> : std::true_type {};
52+
struct is_handle<ur_exp_external_semaphore_handle_t> : std::true_type {};
5353
template <>
5454
struct is_handle<ur_exp_win32_handle_t> : std::true_type {};
5555
template <>
@@ -332,8 +332,8 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
332332
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_sampler_mip_properties_t params);
333333
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_sampler_addr_modes_t params);
334334
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_sampler_cubemap_properties_t params);
335-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_interop_mem_desc_t params);
336-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_interop_semaphore_desc_t params);
335+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_external_mem_desc_t params);
336+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_external_semaphore_desc_t params);
337337
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_exp_image_copy_region_t params);
338338
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_command_buffer_info_t value);
339339
inline std::ostream &operator<<(std::ostream &os, enum ur_exp_command_buffer_command_info_t value);
@@ -750,9 +750,6 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
750750
case UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP:
751751
os << "UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP";
752752
break;
753-
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP:
754-
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP";
755-
break;
756753
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP:
757754
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_SEMAPHORE_EXP";
758755
break;
@@ -942,6 +939,9 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_function_t value) {
942939
case UR_FUNCTION_LOADER_CONFIG_SET_MOCKING_ENABLED:
943940
os << "UR_FUNCTION_LOADER_CONFIG_SET_MOCKING_ENABLED";
944941
break;
942+
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP:
943+
os << "UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP";
944+
break;
945945
default:
946946
os << "unknown enumerator";
947947
break;
@@ -1077,11 +1077,11 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_structure_type_t value
10771077
case UR_STRUCTURE_TYPE_EXP_SAMPLER_MIP_PROPERTIES:
10781078
os << "UR_STRUCTURE_TYPE_EXP_SAMPLER_MIP_PROPERTIES";
10791079
break;
1080-
case UR_STRUCTURE_TYPE_EXP_INTEROP_MEM_DESC:
1081-
os << "UR_STRUCTURE_TYPE_EXP_INTEROP_MEM_DESC";
1080+
case UR_STRUCTURE_TYPE_EXP_EXTERNAL_MEM_DESC:
1081+
os << "UR_STRUCTURE_TYPE_EXP_EXTERNAL_MEM_DESC";
10821082
break;
1083-
case UR_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC:
1084-
os << "UR_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC";
1083+
case UR_STRUCTURE_TYPE_EXP_EXTERNAL_SEMAPHORE_DESC:
1084+
os << "UR_STRUCTURE_TYPE_EXP_EXTERNAL_SEMAPHORE_DESC";
10851085
break;
10861086
case UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR:
10871087
os << "UR_STRUCTURE_TYPE_EXP_FILE_DESCRIPTOR";
@@ -1323,13 +1323,13 @@ inline ur_result_t printStruct(std::ostream &os, const void *ptr) {
13231323
printPtr(os, pstruct);
13241324
} break;
13251325

1326-
case UR_STRUCTURE_TYPE_EXP_INTEROP_MEM_DESC: {
1327-
const ur_exp_interop_mem_desc_t *pstruct = (const ur_exp_interop_mem_desc_t *)ptr;
1326+
case UR_STRUCTURE_TYPE_EXP_EXTERNAL_MEM_DESC: {
1327+
const ur_exp_external_mem_desc_t *pstruct = (const ur_exp_external_mem_desc_t *)ptr;
13281328
printPtr(os, pstruct);
13291329
} break;
13301330

1331-
case UR_STRUCTURE_TYPE_EXP_INTEROP_SEMAPHORE_DESC: {
1332-
const ur_exp_interop_semaphore_desc_t *pstruct = (const ur_exp_interop_semaphore_desc_t *)ptr;
1331+
case UR_STRUCTURE_TYPE_EXP_EXTERNAL_SEMAPHORE_DESC: {
1332+
const ur_exp_external_semaphore_desc_t *pstruct = (const ur_exp_external_semaphore_desc_t *)ptr;
13331333
printPtr(os, pstruct);
13341334
} break;
13351335

@@ -2580,11 +2580,11 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
25802580
case UR_DEVICE_INFO_MIPMAP_LEVEL_REFERENCE_SUPPORT_EXP:
25812581
os << "UR_DEVICE_INFO_MIPMAP_LEVEL_REFERENCE_SUPPORT_EXP";
25822582
break;
2583-
case UR_DEVICE_INFO_INTEROP_MEMORY_IMPORT_SUPPORT_EXP:
2584-
os << "UR_DEVICE_INFO_INTEROP_MEMORY_IMPORT_SUPPORT_EXP";
2583+
case UR_DEVICE_INFO_EXTERNAL_MEMORY_IMPORT_SUPPORT_EXP:
2584+
os << "UR_DEVICE_INFO_EXTERNAL_MEMORY_IMPORT_SUPPORT_EXP";
25852585
break;
2586-
case UR_DEVICE_INFO_INTEROP_SEMAPHORE_IMPORT_SUPPORT_EXP:
2587-
os << "UR_DEVICE_INFO_INTEROP_SEMAPHORE_IMPORT_SUPPORT_EXP";
2586+
case UR_DEVICE_INFO_EXTERNAL_SEMAPHORE_IMPORT_SUPPORT_EXP:
2587+
os << "UR_DEVICE_INFO_EXTERNAL_SEMAPHORE_IMPORT_SUPPORT_EXP";
25882588
break;
25892589
case UR_DEVICE_INFO_CUBEMAP_SUPPORT_EXP:
25902590
os << "UR_DEVICE_INFO_CUBEMAP_SUPPORT_EXP";
@@ -4214,7 +4214,7 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr, ur_device_info
42144214

42154215
os << ")";
42164216
} break;
4217-
case UR_DEVICE_INFO_INTEROP_MEMORY_IMPORT_SUPPORT_EXP: {
4217+
case UR_DEVICE_INFO_EXTERNAL_MEMORY_IMPORT_SUPPORT_EXP: {
42184218
const ur_bool_t *tptr = (const ur_bool_t *)ptr;
42194219
if (sizeof(ur_bool_t) > size) {
42204220
os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
@@ -4226,7 +4226,7 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr, ur_device_info
42264226

42274227
os << ")";
42284228
} break;
4229-
case UR_DEVICE_INFO_INTEROP_SEMAPHORE_IMPORT_SUPPORT_EXP: {
4229+
case UR_DEVICE_INFO_EXTERNAL_SEMAPHORE_IMPORT_SUPPORT_EXP: {
42304230
const ur_bool_t *tptr = (const ur_bool_t *)ptr;
42314231
if (sizeof(ur_bool_t) > size) {
42324232
os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
@@ -8890,11 +8890,11 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_command_t value) {
88908890
case UR_COMMAND_COMMAND_BUFFER_ENQUEUE_EXP:
88918891
os << "UR_COMMAND_COMMAND_BUFFER_ENQUEUE_EXP";
88928892
break;
8893-
case UR_COMMAND_INTEROP_SEMAPHORE_WAIT_EXP:
8894-
os << "UR_COMMAND_INTEROP_SEMAPHORE_WAIT_EXP";
8893+
case UR_COMMAND_EXTERNAL_SEMAPHORE_WAIT_EXP:
8894+
os << "UR_COMMAND_EXTERNAL_SEMAPHORE_WAIT_EXP";
88958895
break;
8896-
case UR_COMMAND_INTEROP_SEMAPHORE_SIGNAL_EXP:
8897-
os << "UR_COMMAND_INTEROP_SEMAPHORE_SIGNAL_EXP";
8896+
case UR_COMMAND_EXTERNAL_SEMAPHORE_SIGNAL_EXP:
8897+
os << "UR_COMMAND_EXTERNAL_SEMAPHORE_SIGNAL_EXP";
88988898
break;
88998899
case UR_COMMAND_TIMESTAMP_RECORDING_EXP:
89008900
os << "UR_COMMAND_TIMESTAMP_RECORDING_EXP";
@@ -9591,11 +9591,11 @@ inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_sampler_cu
95919591
return os;
95929592
}
95939593
///////////////////////////////////////////////////////////////////////////////
9594-
/// @brief Print operator for the ur_exp_interop_mem_desc_t type
9594+
/// @brief Print operator for the ur_exp_external_mem_desc_t type
95959595
/// @returns
95969596
/// std::ostream &
9597-
inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_interop_mem_desc_t params) {
9598-
os << "(struct ur_exp_interop_mem_desc_t){";
9597+
inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_external_mem_desc_t params) {
9598+
os << "(struct ur_exp_external_mem_desc_t){";
95999599

96009600
os << ".stype = ";
96019601

@@ -9611,11 +9611,11 @@ inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_interop_me
96119611
return os;
96129612
}
96139613
///////////////////////////////////////////////////////////////////////////////
9614-
/// @brief Print operator for the ur_exp_interop_semaphore_desc_t type
9614+
/// @brief Print operator for the ur_exp_external_semaphore_desc_t type
96159615
/// @returns
96169616
/// std::ostream &
9617-
inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_interop_semaphore_desc_t params) {
9618-
os << "(struct ur_exp_interop_semaphore_desc_t){";
9617+
inline std::ostream &operator<<(std::ostream &os, const struct ur_exp_external_semaphore_desc_t params) {
9618+
os << "(struct ur_exp_external_semaphore_desc_t){";
96199619

96209620
os << ".stype = ";
96219621

@@ -15132,16 +15132,16 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1513215132
os << *(params->pmemHandleType);
1513315133

1513415134
os << ", ";
15135-
os << ".pInteropMemDesc = ";
15135+
os << ".pExternalMemDesc = ";
1513615136

1513715137
ur::details::printPtr(os,
15138-
*(params->ppInteropMemDesc));
15138+
*(params->ppExternalMemDesc));
1513915139

1514015140
os << ", ";
15141-
os << ".phInteropMem = ";
15141+
os << ".phExternalMem = ";
1514215142

1514315143
ur::details::printPtr(os,
15144-
*(params->pphInteropMem));
15144+
*(params->pphExternalMem));
1514515145

1514615146
return os;
1514715147
}
@@ -15176,10 +15176,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1517615176
*(params->ppImageDesc));
1517715177

1517815178
os << ", ";
15179-
os << ".hInteropMem = ";
15179+
os << ".hExternalMem = ";
1518015180

1518115181
ur::details::printPtr(os,
15182-
*(params->phInteropMem));
15182+
*(params->phExternalMem));
1518315183

1518415184
os << ", ";
1518515185
os << ".phImageMem = ";
@@ -15191,10 +15191,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1519115191
}
1519215192

1519315193
///////////////////////////////////////////////////////////////////////////////
15194-
/// @brief Print operator for the ur_bindless_images_release_interop_exp_params_t type
15194+
/// @brief Print operator for the ur_bindless_images_release_external_memory_exp_params_t type
1519515195
/// @returns
1519615196
/// std::ostream &
15197-
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_release_interop_exp_params_t *params) {
15197+
inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct ur_bindless_images_release_external_memory_exp_params_t *params) {
1519815198

1519915199
os << ".hContext = ";
1520015200

@@ -15208,10 +15208,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1520815208
*(params->phDevice));
1520915209

1521015210
os << ", ";
15211-
os << ".hInteropMem = ";
15211+
os << ".hExternalMem = ";
1521215212

1521315213
ur::details::printPtr(os,
15214-
*(params->phInteropMem));
15214+
*(params->phExternalMem));
1521515215

1521615216
return os;
1521715217
}
@@ -15239,16 +15239,16 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1523915239
os << *(params->psemHandleType);
1524015240

1524115241
os << ", ";
15242-
os << ".pInteropSemaphoreDesc = ";
15242+
os << ".pExternalSemaphoreDesc = ";
1524315243

1524415244
ur::details::printPtr(os,
15245-
*(params->ppInteropSemaphoreDesc));
15245+
*(params->ppExternalSemaphoreDesc));
1524615246

1524715247
os << ", ";
15248-
os << ".phInteropSemaphore = ";
15248+
os << ".phExternalSemaphore = ";
1524915249

1525015250
ur::details::printPtr(os,
15251-
*(params->pphInteropSemaphore));
15251+
*(params->pphExternalSemaphore));
1525215252

1525315253
return os;
1525415254
}
@@ -15271,10 +15271,10 @@ inline std::ostream &operator<<(std::ostream &os, [[maybe_unused]] const struct
1527115271
*(params->phDevice));
1527215272

1527315273
os << ", ";
15274-
os << ".hInteropSemaphore = ";
15274+
os << ".hExternalSemaphore = ";
1527515275

1527615276
ur::details::printPtr(os,
15277-
*(params->phInteropSemaphore));
15277+
*(params->phExternalSemaphore));
1527815278

1527915279
return os;
1528015280
}
@@ -17804,8 +17804,8 @@ inline ur_result_t UR_APICALL printFunctionParams(std::ostream &os, ur_function_
1780417804
case UR_FUNCTION_BINDLESS_IMAGES_MAP_EXTERNAL_ARRAY_EXP: {
1780517805
os << (const struct ur_bindless_images_map_external_array_exp_params_t *)params;
1780617806
} break;
17807-
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_INTEROP_EXP: {
17808-
os << (const struct ur_bindless_images_release_interop_exp_params_t *)params;
17807+
case UR_FUNCTION_BINDLESS_IMAGES_RELEASE_EXTERNAL_MEMORY_EXP: {
17808+
os << (const struct ur_bindless_images_release_external_memory_exp_params_t *)params;
1780917809
} break;
1781017810
case UR_FUNCTION_BINDLESS_IMAGES_IMPORT_EXTERNAL_SEMAPHORE_EXP: {
1781117811
os << (const struct ur_bindless_images_import_external_semaphore_exp_params_t *)params;

0 commit comments

Comments
 (0)