Skip to content

Commit 0bad40b

Browse files
rwmcguirrwmcguir
authored
Merge branch 'master' into 1_27_0
2 parents aa2a13e + 0e8487f commit 0bad40b

5 files changed

Lines changed: 75 additions & 75 deletions

File tree

‎scripts/templates/nullddi.cpp.mako‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ ${tbl['export']['name']}(
156156
if( nullptr == pDdiTable )
157157
return ${X}_RESULT_ERROR_INVALID_NULL_POINTER;
158158

159-
if( driver::context.version < version )
159+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
160160
return ${X}_RESULT_ERROR_UNSUPPORTED_VERSION;
161161

162162
${x}_result_t result = ${X}_RESULT_SUCCESS;

‎source/drivers/null/ze_nullddi.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6576,7 +6576,7 @@ zeGetGlobalProcAddrTable(
65766576
if( nullptr == pDdiTable )
65776577
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
65786578

6579-
if( driver::context.version < version )
6579+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
65806580
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
65816581

65826582
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6613,7 +6613,7 @@ zeGetRTASBuilderProcAddrTable(
66136613
if( nullptr == pDdiTable )
66146614
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
66156615

6616-
if( driver::context.version < version )
6616+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
66176617
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
66186618

66196619
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6648,7 +6648,7 @@ zeGetRTASBuilderExpProcAddrTable(
66486648
if( nullptr == pDdiTable )
66496649
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
66506650

6651-
if( driver::context.version < version )
6651+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
66526652
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
66536653

66546654
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6681,7 +6681,7 @@ zeGetRTASParallelOperationProcAddrTable(
66816681
if( nullptr == pDdiTable )
66826682
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
66836683

6684-
if( driver::context.version < version )
6684+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
66856685
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
66866686

66876687
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6714,7 +6714,7 @@ zeGetRTASParallelOperationExpProcAddrTable(
67146714
if( nullptr == pDdiTable )
67156715
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
67166716

6717-
if( driver::context.version < version )
6717+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
67186718
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
67196719

67206720
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6747,7 +6747,7 @@ zeGetDriverProcAddrTable(
67476747
if( nullptr == pDdiTable )
67486748
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
67496749

6750-
if( driver::context.version < version )
6750+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
67516751
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
67526752

67536753
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6790,7 +6790,7 @@ zeGetDriverExpProcAddrTable(
67906790
if( nullptr == pDdiTable )
67916791
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
67926792

6793-
if( driver::context.version < version )
6793+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
67946794
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
67956795

67966796
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6817,7 +6817,7 @@ zeGetDeviceProcAddrTable(
68176817
if( nullptr == pDdiTable )
68186818
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
68196819

6820-
if( driver::context.version < version )
6820+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
68216821
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
68226822

68236823
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6890,7 +6890,7 @@ zeGetDeviceExpProcAddrTable(
68906890
if( nullptr == pDdiTable )
68916891
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
68926892

6893-
if( driver::context.version < version )
6893+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
68946894
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
68956895

68966896
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6917,7 +6917,7 @@ zeGetContextProcAddrTable(
69176917
if( nullptr == pDdiTable )
69186918
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
69196919

6920-
if( driver::context.version < version )
6920+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
69216921
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
69226922

69236923
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6960,7 +6960,7 @@ zeGetCommandQueueProcAddrTable(
69606960
if( nullptr == pDdiTable )
69616961
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
69626962

6963-
if( driver::context.version < version )
6963+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
69646964
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
69656965

69666966
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -6997,7 +6997,7 @@ zeGetCommandListProcAddrTable(
69976997
if( nullptr == pDdiTable )
69986998
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
69996999

7000-
if( driver::context.version < version )
7000+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
70017001
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
70027002

70037003
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7098,7 +7098,7 @@ zeGetCommandListExpProcAddrTable(
70987098
if( nullptr == pDdiTable )
70997099
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
71007100

7101-
if( driver::context.version < version )
7101+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
71027102
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
71037103

71047104
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7139,7 +7139,7 @@ zeGetEventProcAddrTable(
71397139
if( nullptr == pDdiTable )
71407140
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
71417141

7142-
if( driver::context.version < version )
7142+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
71437143
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
71447144

71457145
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7196,7 +7196,7 @@ zeGetEventExpProcAddrTable(
71967196
if( nullptr == pDdiTable )
71977197
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
71987198

7199-
if( driver::context.version < version )
7199+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
72007200
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
72017201

72027202
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7223,7 +7223,7 @@ zeGetEventPoolProcAddrTable(
72237223
if( nullptr == pDdiTable )
72247224
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
72257225

7226-
if( driver::context.version < version )
7226+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
72277227
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
72287228

72297229
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7264,7 +7264,7 @@ zeGetFenceProcAddrTable(
72647264
if( nullptr == pDdiTable )
72657265
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
72667266

7267-
if( driver::context.version < version )
7267+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
72687268
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
72697269

72707270
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7299,7 +7299,7 @@ zeGetImageProcAddrTable(
72997299
if( nullptr == pDdiTable )
73007300
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
73017301

7302-
if( driver::context.version < version )
7302+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
73037303
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
73047304

73057305
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7334,7 +7334,7 @@ zeGetImageExpProcAddrTable(
73347334
if( nullptr == pDdiTable )
73357335
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
73367336

7337-
if( driver::context.version < version )
7337+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
73387338
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
73397339

73407340
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7365,7 +7365,7 @@ zeGetKernelProcAddrTable(
73657365
if( nullptr == pDdiTable )
73667366
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
73677367

7368-
if( driver::context.version < version )
7368+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
73697369
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
73707370

73717371
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7414,7 +7414,7 @@ zeGetKernelExpProcAddrTable(
74147414
if( nullptr == pDdiTable )
74157415
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
74167416

7417-
if( driver::context.version < version )
7417+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
74187418
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
74197419

74207420
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7447,7 +7447,7 @@ zeGetMemProcAddrTable(
74477447
if( nullptr == pDdiTable )
74487448
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
74497449

7450-
if( driver::context.version < version )
7450+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
74517451
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
74527452

74537453
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7498,7 +7498,7 @@ zeGetMemExpProcAddrTable(
74987498
if( nullptr == pDdiTable )
74997499
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
75007500

7501-
if( driver::context.version < version )
7501+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
75027502
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
75037503

75047504
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7531,7 +7531,7 @@ zeGetModuleProcAddrTable(
75317531
if( nullptr == pDdiTable )
75327532
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
75337533

7534-
if( driver::context.version < version )
7534+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
75357535
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
75367536

75377537
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7574,7 +7574,7 @@ zeGetModuleBuildLogProcAddrTable(
75747574
if( nullptr == pDdiTable )
75757575
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
75767576

7577-
if( driver::context.version < version )
7577+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
75787578
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
75797579

75807580
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7603,7 +7603,7 @@ zeGetPhysicalMemProcAddrTable(
76037603
if( nullptr == pDdiTable )
76047604
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
76057605

7606-
if( driver::context.version < version )
7606+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
76077607
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
76087608

76097609
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7634,7 +7634,7 @@ zeGetSamplerProcAddrTable(
76347634
if( nullptr == pDdiTable )
76357635
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
76367636

7637-
if( driver::context.version < version )
7637+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
76387638
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
76397639

76407640
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7663,7 +7663,7 @@ zeGetVirtualMemProcAddrTable(
76637663
if( nullptr == pDdiTable )
76647664
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
76657665

7666-
if( driver::context.version < version )
7666+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
76677667
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
76687668

76697669
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7702,7 +7702,7 @@ zeGetFabricEdgeExpProcAddrTable(
77027702
if( nullptr == pDdiTable )
77037703
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
77047704

7705-
if( driver::context.version < version )
7705+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
77067706
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
77077707

77087708
ze_result_t result = ZE_RESULT_SUCCESS;
@@ -7733,7 +7733,7 @@ zeGetFabricVertexExpProcAddrTable(
77337733
if( nullptr == pDdiTable )
77347734
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
77357735

7736-
if( driver::context.version < version )
7736+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
77377737
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
77387738

77397739
ze_result_t result = ZE_RESULT_SUCCESS;

‎source/drivers/null/zer_nullddi.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ zerGetGlobalProcAddrTable(
149149
if( nullptr == pDdiTable )
150150
return ZE_RESULT_ERROR_INVALID_NULL_POINTER;
151151

152-
if( driver::context.version < version )
152+
if (ZE_MAJOR_VERSION(driver::context.version) != ZE_MAJOR_VERSION(version))
153153
return ZE_RESULT_ERROR_UNSUPPORTED_VERSION;
154154

155155
ze_result_t result = ZE_RESULT_SUCCESS;

0 commit comments

Comments
 (0)