Merge branch 'main' into negative_command_buffer_barrier

KhronosGroup · Apr 22, 2024 · 067475b · 067475b
2 parents 0909fda + 4c085de
commit 067475b
Show file tree

Hide file tree

Showing 6 changed files with 886 additions and 14 deletions.
diff --git a/test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt b/test_conformance/extensions/cl_khr_command_buffer/CMakeLists.txt
@@ -15,10 +15,13 @@ set(${MODULE_NAME}_SOURCES
     command_buffer_test_copy.cpp
     command_buffer_test_barrier.cpp
     command_buffer_test_event_info.cpp
-    command_buffer_finalize.cpp
-    negative_command_buffer_barrier.cpp
+    command_buffer_finalize.cpp    
+    negative_command_buffer_finalize.cpp
+    negative_command_buffer_retain_release.cpp
     negative_command_buffer_create.cpp
     negative_command_buffer_get_info.cpp
+    negative_command_buffer_barrier.cpp
+    negative_command_buffer_enqueue.cpp
 )
 
 set_gnulike_module_compile_flags("-Wno-sign-compare")

diff --git a/test_conformance/extensions/cl_khr_command_buffer/main.cpp b/test_conformance/extensions/cl_khr_command_buffer/main.cpp
@@ -64,11 +64,10 @@ test_definition test_list[] = {
     ADD_TEST(event_info_reference_count),
     ADD_TEST(finalize_invalid),
     ADD_TEST(finalize_empty),
-    ADD_TEST(negative_command_buffer_barrier_not_null_queue),
-    ADD_TEST(negative_command_buffer_barrier_invalid_command_buffer),
-    ADD_TEST(negative_command_buffer_barrier_buffer_finalized),
-    ADD_TEST(negative_command_buffer_barrier_mutable_handle_not_null),
-    ADD_TEST(negative_command_buffer_barrier_sync_points_null_or_num_zero),
+    ADD_TEST(negative_retain_command_buffer_invalid_command_buffer),
+    ADD_TEST(negative_release_command_buffer_invalid_command_buffer),
+    ADD_TEST(negative_finalize_command_buffer_invalid_command_buffer),
+    ADD_TEST(negative_finalize_command_buffer_not_recording_state),
     ADD_TEST(negative_create_command_buffer_num_queues),
     ADD_TEST(negative_create_command_buffer_null_queues),
     ADD_TEST(negative_create_command_buffer_repeated_properties),
@@ -83,6 +82,23 @@ test_definition test_list[] = {
     ADD_TEST(negative_get_command_buffer_info_state),
     ADD_TEST(negative_get_command_buffer_info_prop_array),
     ADD_TEST(negative_get_command_buffer_info_context),
+    ADD_TEST(negative_command_buffer_barrier_not_null_queue),
+    ADD_TEST(negative_command_buffer_barrier_invalid_command_buffer),
+    ADD_TEST(negative_command_buffer_barrier_buffer_finalized),
+    ADD_TEST(negative_command_buffer_barrier_mutable_handle_not_null),
+    ADD_TEST(negative_command_buffer_barrier_sync_points_null_or_num_zero),
+    ADD_TEST(negative_enqueue_command_buffer_invalid_command_buffer),
+    ADD_TEST(negative_enqueue_command_buffer_not_finalized),
+    ADD_TEST(
+        negative_enqueue_command_buffer_without_simultaneous_no_pending_state),
+    ADD_TEST(negative_enqueue_command_buffer_null_queues_num_queues),
+    ADD_TEST(
+        negative_enqueue_command_buffer_num_queues_not_zero_different_while_buffer_creation),
+    ADD_TEST(negative_enqueue_command_buffer_not_valid_queue_in_queues),
+    ADD_TEST(negative_enqueue_queue_not_compatible),
+    ADD_TEST(negative_enqueue_queue_with_different_context),
+    ADD_TEST(negative_enqueue_command_buffer_different_context_than_event),
+    ADD_TEST(negative_enqueue_event_wait_list_null_or_events_null),
 };
 
 int main(int argc, const char *argv[])