diff options
| author | Yang Rong <rong.r.yang@intel.com> | 2015-11-10 15:52:12 +0800 |
|---|---|---|
| committer | Yang Rong <rong.r.yang@intel.com> | 2016-11-08 20:38:20 +0800 |
| commit | 0fb78a41d0deda68faa0ad0b382af454ef2ffba1 (patch) | |
| tree | 90d84216e2e01c671fcc0009290e3573bbb7e931 | |
| parent | b303506b1e3f17a3ab660ef6b66ab24c301270ef (diff) | |
OCL20: Add OpenCL2.0 apis to icd.
Also set the LIBCL_C_VERSION to 2.0
Signed-off-by: Yang Rong <rong.r.yang@intel.com>
Reviewed-by: "Song, Ruiling" <ruiling.song@intel.com>
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/cl_khr_icd.c | 30 |
2 files changed, 22 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f36ac717..713cfa94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) PROJECT(OCL) set (LIBCL_DRIVER_VERSION_MAJOR 1) set (LIBCL_DRIVER_VERSION_MINOR 3) -set (LIBCL_C_VERSION_MAJOR 1) -set (LIBCL_C_VERSION_MINOR 2) +if (ENABLE_OPENCL_20) + set (LIBCL_C_VERSION_MAJOR 2) + set (LIBCL_C_VERSION_MINOR 0) +else (ENABLE_OPENCL_20) + set (LIBCL_C_VERSION_MAJOR 1) + set (LIBCL_C_VERSION_MINOR 2) +endif (ENABLE_OPENCL_20) if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") set(COMPILER "CLANG") elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") diff --git a/src/cl_khr_icd.c b/src/cl_khr_icd.c index 84b4beba..dc5be762 100644 --- a/src/cl_khr_icd.c +++ b/src/cl_khr_icd.c @@ -169,23 +169,23 @@ struct _cl_icd_dispatch const cl_khr_icd_dispatch = { (void *) NULL, (void *) NULL, (void *) NULL, -#if (OCL_ICD_IDENTIFIED_FUNCTIONS > 110) (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) NULL, - (void *) clGetKernelSubGroupInfoKHR, #endif +#ifdef CL_VERSION_2_0 + (void *) NULL /* clCreateCommandQueueWithProperties */, + (void *) NULL /* clCreatePipe */, + (void *) NULL /* clGetPipeInfo */, + clSVMAlloc, + clSVMFree, + (void *) NULL /* clEnqueueSVMFree */, + (void *) NULL /* clEnqueueSVMMemcpy */, + (void *) NULL /* clEnqueueSVMMemFill */, + (void *) clEnqueueSVMMap, + (void *) clEnqueueSVMUnmap, + (void *) NULL /* clCreateSamplerWithProperties */, + clSetKernelArgSVMPointer, + (void *) NULL, + clGetKernelSubGroupInfoKHR, #endif }; |