fixed VX_CONTEXT_CL_QUEUE_PROPERTIES

Author: rgiduthuri

openvx/ago/ago_drama_alloc.cpp

@@ -281,7 +281,8 @@ static int agoOptimizeDramaAllocGpuResources(AgoGraph * graph)
 			cl_int err = -1;
 			graph->opencl_device = context->opencl_device_list[0];
 #if defined(CL_VERSION_2_0)
-			graph->opencl_cmdq = clCreateCommandQueueWithProperties(context->opencl_context, graph->opencl_device, &context->opencl_cmdq_properties, &err);
+            cl_queue_properties properties[] = { CL_QUEUE_PROPERTIES, context->opencl_cmdq_properties, 0 };
+			graph->opencl_cmdq = clCreateCommandQueueWithProperties(context->opencl_context, graph->opencl_device, properties, &err);
 #else
 			graph->opencl_cmdq = clCreateCommandQueue(context->opencl_context, graph->opencl_device, context->opencl_cmdq_properties, &err);
 #endif

openvx/ago/ago_internal.h

@@ -688,10 +688,8 @@ struct AgoContext {
 	char opencl_extensions[1024];
 #if defined(CL_VERSION_2_0)
 	cl_device_svm_capabilities opencl_svmcaps;
-    cl_queue_properties opencl_cmdq_properties;
-#else
-    cl_command_queue_properties opencl_cmdq_properties;
 #endif
+    cl_command_queue_properties opencl_cmdq_properties;
 	cl_uint      opencl_num_devices;
 	cl_device_id opencl_device_list[16];
 	char opencl_build_options[256];

openvx/ago/ago_util_opencl.cpp

@@ -317,7 +317,8 @@ int agoGpuOclCreateContext(AgoContext * context, cl_context opencl_context)
 #endif
 	// create command queue for buffer sync
 #if defined(CL_VERSION_2_0)
-	context->opencl_cmdq = clCreateCommandQueueWithProperties(context->opencl_context, context->opencl_device_list[device_id], &context->opencl_cmdq_properties, &status);
+	cl_queue_properties properties[] = { CL_QUEUE_PROPERTIES, context->opencl_cmdq_properties, 0 };
+	context->opencl_cmdq = clCreateCommandQueueWithProperties(context->opencl_context, context->opencl_device_list[device_id], properties, &status);
 #else
 	context->opencl_cmdq = clCreateCommandQueue(context->opencl_context, context->opencl_device_list[device_id], context->opencl_cmdq_properties, &status);
 #endif

openvx/api/vx_api.cpp

@@ -262,8 +262,8 @@ VX_API_ENTRY vx_status VX_API_CALL vxQueryContext(vx_context context, vx_enum at
 				}
 				break;
 			case VX_CONTEXT_CL_QUEUE_PROPERTIES:
-				if (size == sizeof(vx_uint32)) {
-					*(vx_uint32 *)ptr = context->opencl_cmdq_properties;
+				if (size == sizeof(cl_command_queue_properties)) {
+					*(cl_command_queue_properties *)ptr = context->opencl_cmdq_properties;
 					status = VX_SUCCESS;
 				}
 				break;
@@ -364,8 +364,8 @@ VX_API_ENTRY vx_status VX_API_CALL vxSetContextAttribute(vx_context context, vx_
 				}
 				break;
 			case VX_CONTEXT_CL_QUEUE_PROPERTIES:
-				if (size == sizeof(vx_uint32)) {
-					context->opencl_cmdq_properties = *(vx_uint32 *)ptr;
+				if (size == sizeof(cl_command_queue_properties)) {
+					context->opencl_cmdq_properties = *(cl_command_queue_properties *)ptr;
 					status = VX_SUCCESS;
 				}
 				break;

openvx/include/vx_ext_amd.h

@@ -97,7 +97,7 @@ enum vx_context_attribute_amd_e {
 	VX_CONTEXT_ATTRIBUTE_AMD_SET_MERGE_RULE = VX_ATTRIBUTE_BASE(VX_ID_AMD, VX_TYPE_CONTEXT) + 0x04,
 	/*! \brief tensor Data max num of dimensions supported by HW. */
 	VX_CONTEXT_MAX_TENSOR_DIMENSIONS = VX_ATTRIBUTE_BASE(VX_ID_AMD, VX_TYPE_CONTEXT) + 0x05,
-	/*! \brief CL_QUEUE_PROPERTIES to be used for creating OpenCL command queue. Use a <tt>\ref vx_uint32</tt> parameter. */
+	/*! \brief CL_QUEUE_PROPERTIES to be used for creating OpenCL command queue. Use a <tt>\ref cl_command_queue_properties</tt> parameter. */
 	VX_CONTEXT_CL_QUEUE_PROPERTIES = VX_ATTRIBUTE_BASE(VX_ID_AMD, VX_TYPE_CONTEXT) + 0x06,
 };