dbk: nms fix arg checking and change linking

Author: RABijl

lib/CL/clSetKernelArg.c

@@ -227,9 +227,11 @@ pocl_verify_dbk_kernel_args (cl_mem buf,
         switch (arg_index)
           {
           case 0:
+            return (buf->size >= attrs->num_boxes * sizeof (cl_uint) * 4)
+                   ? CL_SUCCESS
+                   : CL_INVALID_ARG_VALUE;
           case 1:
-            return ((attrs->num_boxes > 0)
-                    && buf->size >= attrs->num_boxes * sizeof (cl_uint) * 4)
+            return (buf->size >= attrs->num_boxes * sizeof (cl_float))
                      ? CL_SUCCESS
                      : CL_INVALID_ARG_VALUE;
           case 2:

lib/CL/devices/CMakeLists.txt

@@ -223,7 +223,8 @@ if(HAVE_ONNXRT)
   target_link_libraries("pocl-devices" PRIVATE onnxruntime::onnxruntime)
 endif ()
 if(HAVE_OPENCV)
-  target_link_libraries("pocl-devices" PRIVATE pocl_dbk_khr_dnn_utils opencv_dnn)
+  add_dependencies("pocl-devices" pocl_dbk_khr_dnn_utils)
+  target_link_libraries("pocl-devices" PRIVATE $<TARGET_OBJECTS:pocl_dbk_khr_dnn_utils> opencv_dnn)
 endif ()
 
 set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}"

lib/CL/devices/cpu_dbk/CMakeLists.txt

@@ -16,9 +16,9 @@ list(APPEND POCL_DEVICES_SOURCES
 )
 
 if(HAVE_OPENCV)
-    add_library(pocl_dbk_khr_dnn_utils STATIC
-            ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_dnn_utils.cpp
-            ${CMAKE_CURRENT_SOURCE_DIR}/pocl_dbk_khr_dnn_utils.hh)
+    add_library(pocl_dbk_khr_dnn_utils OBJECT
+            pocl_dbk_khr_dnn_utils.cpp
+            pocl_dbk_khr_dnn_utils.hh)
     target_link_libraries(pocl_dbk_khr_dnn_utils PRIVATE opencv_dnn)
 
     list(APPEND POCL_DEVICES_LINK_LIST pocl_dbk_khr_dnn_utils)