Skip to content

Commit 9be6dc2

Browse files
committed
mutable_dispatch & negative command_buffer tests: fix Skip logic
If mutable_dispatch extension is supported, the mutable handle is allowed to be not null. In that case, skip the HandleNotNull negative tests.
1 parent 88a66db commit 9be6dc2

4 files changed

Lines changed: 36 additions & 0 deletions

File tree

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_barrier.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ struct CommandBufferBarrierMutableHandleNotNull : public BasicCommandBufferTest
9292
{
9393
using BasicCommandBufferTest::BasicCommandBufferTest;
9494

95+
bool Skip() override
96+
{
97+
if (BasicCommandBufferTest::Skip()) return true;
98+
return is_extension_available(device,
99+
"cl_khr_command_buffer_mutable_dispatch");
100+
}
101+
95102
cl_int Run() override
96103
{
97104
cl_mutable_command_khr mutable_handle;

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_copy_image.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,13 @@ struct CommandBufferCopyImageMutableHandleNotNull : public CommandCopyBaseTest
357357
{
358358
using CommandCopyBaseTest::CommandCopyBaseTest;
359359

360+
bool Skip() override
361+
{
362+
if (CommandCopyBaseTest::Skip()) return true;
363+
return is_extension_available(device,
364+
"cl_khr_command_buffer_mutable_dispatch");
365+
}
366+
360367
cl_int Run() override
361368
{
362369
cl_mutable_command_khr mutable_handle;

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_fill.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,13 @@ struct CommandBufferCommandFillBufferMutableHandleNotNull
416416
{
417417
using CommandFillBaseTest::CommandFillBaseTest;
418418

419+
bool Skip() override
420+
{
421+
if (CommandFillBaseTest::Skip()) return true;
422+
return is_extension_available(device,
423+
"cl_khr_command_buffer_mutable_dispatch");
424+
}
425+
419426
cl_int Run() override
420427
{
421428
cl_mutable_command_khr mutable_handle;
@@ -440,6 +447,13 @@ struct CommandBufferCommandFillImageMutableHandleNotNull
440447
{
441448
using CommandFillBaseTest::CommandFillBaseTest;
442449

450+
bool Skip() override
451+
{
452+
if (CommandFillBaseTest::Skip()) return true;
453+
return is_extension_available(device,
454+
"cl_khr_command_buffer_mutable_dispatch");
455+
}
456+
443457
cl_int Run() override
444458
{
445459
cl_mutable_command_khr mutable_handle;

test_conformance/extensions/cl_khr_command_buffer/negative_command_buffer_svm_mem.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,14 @@ struct CommandBufferCommandSVMMutableHandleNotNull
207207
{
208208
using BasicSVMCommandBufferTest::BasicSVMCommandBufferTest;
209209

210+
bool Skip() override
211+
{
212+
if (BasicSVMCommandBufferTest::Skip()) return true;
213+
return is_extension_available(device,
214+
"cl_khr_command_buffer_mutable_dispatch");
215+
}
216+
217+
210218
cl_int Run() override
211219
{
212220
cl_mutable_command_khr mutable_handle;

0 commit comments

Comments
 (0)