Skip to content

Commit 31fa791

Browse files
igchorigchor
committed
fix header
1 parent e0176c7 commit 31fa791

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎unified-runtime/source/adapters/level_zero/image.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ ur_result_t urBindlessImagesWaitExternalSemaphoreExp(
164164
(ZEL_HANDLE_EVENT, ZeEvent, (void **)&EventHandles[i + 1]));
165165
}
166166
}
167-
ze_intel_external_semaphore_wait_params_exp_t WaitParams = {
168-
ZE_INTEL_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WAIT_PARAMS_EXP, nullptr, 0};
167+
ze_external_semaphore_wait_params_ext_t WaitParams = {
168+
ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WAIT_PARAMS_EXT, nullptr, 0};
169169
WaitParams.value = hasValue ? waitValue : 0;
170-
const ze_intel_external_semaphore_exp_handle_t hExtSemaphore =
171-
reinterpret_cast<ze_intel_external_semaphore_exp_handle_t>(hSemaphore);
170+
const ze_external_semaphore_ext_handle_t hExtSemaphore =
171+
reinterpret_cast<ze_external_semaphore_ext_handle_t>(hSemaphore);
172172
ZE2UR_CALL(UrPlatform->ZeExternalSemaphoreExt
173173
.zexExpCommandListAppendWaitExternalSemaphoresExp,
174174
(translatedCommandList, 1, &hExtSemaphore, &WaitParams,
@@ -233,12 +233,12 @@ ur_result_t urBindlessImagesSignalExternalSemaphoreExp(
233233
(ZeCommandList, 1, &hExtSemaphore, &SignalParams, ZeEvent,
234234
WaitList.Length, WaitList.ZeEventList));
235235
} else {
236-
ze_intel_external_semaphore_signal_params_exp_t SignalParams = {
237-
ZE_INTEL_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_EXP, nullptr,
236+
ze_external_semaphore_signal_params_ext_t SignalParams = {
237+
ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_EXT, nullptr,
238238
0};
239239
SignalParams.value = hasValue ? signalValue : 0;
240-
const ze_intel_external_semaphore_exp_handle_t hExtSemaphore =
241-
reinterpret_cast<ze_intel_external_semaphore_exp_handle_t>(hSemaphore);
240+
const ze_external_semaphore_ext_handle_t hExtSemaphore =
241+
reinterpret_cast<ze_external_semaphore_ext_handle_t>(hSemaphore);
242242

243243
ze_command_list_handle_t translatedCommandList;
244244
ZE2UR_CALL(zelLoaderTranslateHandle,

‎unified-runtime/source/adapters/level_zero/image_common.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,14 +1421,14 @@ ur_result_t urBindlessImagesImportExternalSemaphoreExp(
14211421
(ur_exp_external_semaphore_handle_t)ExtSemaphoreHandle;
14221422

14231423
} else {
1424-
ze_intel_external_semaphore_exp_desc_t SemDesc = {
1425-
ZE_INTEL_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_EXP_DESC, nullptr,
1426-
ZE_EXTERNAL_SEMAPHORE_EXP_FLAGS_OPAQUE_FD};
1427-
ze_intel_external_semaphore_exp_handle_t ExtSemaphoreHandle;
1428-
ze_intel_external_semaphore_desc_fd_exp_desc_t FDExpDesc = {
1429-
ZE_INTEL_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_FD_EXP_DESC, nullptr, 0};
1430-
_ze_intel_external_semaphore_win32_exp_desc_t Win32ExpDesc = {
1431-
ZE_INTEL_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXP_DESC, nullptr,
1424+
ze_external_semaphore_ext_desc_t SemDesc = {
1425+
ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_EXT_DESC, nullptr,
1426+
ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_OPAQUE_FD};
1427+
ze_external_semaphore_ext_handle_t ExtSemaphoreHandle;
1428+
ze_external_semaphore_fd_ext_desc_t FDExpDesc = {
1429+
ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_FD_EXT_DESC, nullptr, 0};
1430+
_ze_external_semaphore_win32_ext_desc_t Win32ExpDesc = {
1431+
ZE_STRUCTURE_TYPE_EXTERNAL_SEMAPHORE_WIN32_EXT_DESC, nullptr,
14321432
nullptr, nullptr};
14331433
void *pNext = const_cast<void *>(pExternalSemaphoreDesc->pNext);
14341434
while (pNext != nullptr) {
@@ -1441,10 +1441,10 @@ ur_result_t urBindlessImagesImportExternalSemaphoreExp(
14411441
SemDesc.pNext = &FDExpDesc;
14421442
switch (semHandleType) {
14431443
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_OPAQUE_FD:
1444-
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXP_FLAGS_OPAQUE_FD;
1444+
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_OPAQUE_FD;
14451445
break;
14461446
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_TIMELINE_FD:
1447-
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXP_FLAGS_TIMELINE_SEMAPHORE_FD;
1447+
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_VK_TIMELINE_SEMAPHORE_FD;
14481448
break;
14491449
default:
14501450
return UR_RESULT_ERROR_INVALID_VALUE;
@@ -1454,14 +1454,14 @@ ur_result_t urBindlessImagesImportExternalSemaphoreExp(
14541454
auto Win32Handle = static_cast<const ur_exp_win32_handle_t *>(pNext);
14551455
switch (semHandleType) {
14561456
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT:
1457-
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXP_FLAGS_OPAQUE_WIN32;
1457+
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_OPAQUE_WIN32;
14581458
break;
14591459
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_WIN32_NT_DX12_FENCE:
1460-
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXP_FLAGS_D3D12_FENCE;
1460+
SemDesc.flags = ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_D3D12_FENCE;
14611461
break;
14621462
case UR_EXP_EXTERNAL_SEMAPHORE_TYPE_TIMELINE_WIN32_NT:
14631463
SemDesc.flags =
1464-
ZE_EXTERNAL_SEMAPHORE_EXP_FLAGS_TIMELINE_SEMAPHORE_WIN32;
1464+
ZE_EXTERNAL_SEMAPHORE_EXT_FLAG_VK_TIMELINE_SEMAPHORE_WIN32;
14651465
break;
14661466
default:
14671467
return UR_RESULT_ERROR_INVALID_VALUE;
@@ -1503,7 +1503,7 @@ ur_result_t urBindlessImagesReleaseExternalSemaphoreExp(
15031503
} else {
15041504
ZE2UR_CALL(UrPlatform->ZeExternalSemaphoreExt
15051505
.zexExpDeviceReleaseExternalSemaphoreExp,
1506-
((ze_intel_external_semaphore_exp_handle_t)hExternalSemaphore));
1506+
((ze_external_semaphore_ext_handle_t)hExternalSemaphore));
15071507
}
15081508

15091509
return UR_RESULT_SUCCESS;

‎unified-runtime/source/adapters/level_zero/platform.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ ur_result_t ur_platform_handle_t_::initialize() {
266266
}
267267
}
268268
// Check if extension is available for Exp External Sempahores
269-
if (strncmp(extension.name, ZE_INTEL_EXTERNAL_SEMAPHORE_EXP_NAME,
270-
strlen(ZE_INTEL_EXTERNAL_SEMAPHORE_EXP_NAME) + 1) == 0) {
271-
if (extension.version == ZE_EXTERNAL_SEMAPHORE_EXP_VERSION_1_0) {
269+
if (strncmp(extension.name, ZE_EXTERNAL_SEMAPHORES_EXTENSION_NAME,
270+
strlen(ZE_EXTERNAL_SEMAPHORES_EXTENSION_NAME) + 1) == 0) {
271+
if (extension.version == ZE_EXTERNAL_SEMAPHORE_EXT_VERSION_1_0) {
272272
ZeIntelExternalSemaphoreExtensionSupported = true;
273273
}
274274
}

‎unified-runtime/source/adapters/level_zero/platform.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,20 @@ struct ur_platform_handle_t_ : ur::handle_base<ur::level_zero::ddi_getter>,
149149
zexDeviceReleaseExternalSemaphoreExp = nullptr;
150150
// Driver EXP Functions
151151
ze_result_t (*zexExpImportExternalSemaphoreExp)(
152-
ze_device_handle_t, const ze_intel_external_semaphore_exp_desc_t *,
153-
ze_intel_external_semaphore_exp_handle_t *);
152+
ze_device_handle_t, const ze_external_semaphore_ext_desc_t *,
153+
ze_external_semaphore_ext_handle_t *);
154154
ze_result_t (*zexExpCommandListAppendWaitExternalSemaphoresExp)(
155155
ze_command_list_handle_t, unsigned int,
156-
const ze_intel_external_semaphore_exp_handle_t *,
157-
const ze_intel_external_semaphore_wait_params_exp_t *,
156+
const ze_external_semaphore_ext_handle_t *,
157+
const ze_external_semaphore_wait_params_ext_t *,
158158
ze_event_handle_t, uint32_t, ze_event_handle_t *);
159159
ze_result_t (*zexExpCommandListAppendSignalExternalSemaphoresExp)(
160160
ze_command_list_handle_t, size_t,
161-
const ze_intel_external_semaphore_exp_handle_t *,
162-
const ze_intel_external_semaphore_signal_params_exp_t *,
161+
const ze_external_semaphore_ext_handle_t *,
162+
const ze_external_semaphore_signal_params_ext_t *,
163163
ze_event_handle_t, uint32_t, ze_event_handle_t *);
164164
ze_result_t (*zexExpDeviceReleaseExternalSemaphoreExp)(
165-
ze_intel_external_semaphore_exp_handle_t);
165+
ze_external_semaphore_ext_handle_t);
166166
} ZeExternalSemaphoreExt;
167167

168168
struct ZeCommandListImmediateAppendExtension {

0 commit comments

Comments
 (0)