From 6f8b90a11a42871501299b81774c23b268eb28c8 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sun, 14 Oct 2018 12:39:11 +0200 Subject: [PATCH] Add support for latest OpenCL headers from Khronos --- .gitmodules | 3 +++ deps/OpenCL-Headers/CL | 1 - deps/git/OpenCL-Headers | 1 + include/ext_OpenCL.h | 2 ++ src/Makefile | 2 +- 5 files changed, 7 insertions(+), 2 deletions(-) delete mode 160000 deps/OpenCL-Headers/CL create mode 160000 deps/git/OpenCL-Headers diff --git a/.gitmodules b/.gitmodules index 0d14e5c45..3fe61e979 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "deps/OpenCL-Headers/CL"] path = deps/OpenCL-Headers/CL url = https://github.com/KhronosGroup/OpenCL-Headers.git +[submodule "OpenCL-Headers"] + path = deps/git/OpenCL-Headers + url = https://github.com/KhronosGroup/OpenCL-Headers.git diff --git a/deps/OpenCL-Headers/CL b/deps/OpenCL-Headers/CL deleted file mode 160000 index bf0f43b76..000000000 --- a/deps/OpenCL-Headers/CL +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bf0f43b76f4556c3d5717f8ba8a01216b27f4af7 diff --git a/deps/git/OpenCL-Headers b/deps/git/OpenCL-Headers new file mode 160000 index 000000000..d51692456 --- /dev/null +++ b/deps/git/OpenCL-Headers @@ -0,0 +1 @@ +Subproject commit d5169245693563d4c69434ba061d92d3d68c4123 diff --git a/include/ext_OpenCL.h b/include/ext_OpenCL.h index beb9bbd0d..f572736e3 100644 --- a/include/ext_OpenCL.h +++ b/include/ext_OpenCL.h @@ -6,6 +6,8 @@ #ifndef _EXT_OPENCL_H #define _EXT_OPENCL_H +#define CL_TARGET_OPENCL_VERSION 120 + #define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_2_0_APIS diff --git a/src/Makefile b/src/Makefile index 1a870cb54..da9b469ed 100644 --- a/src/Makefile +++ b/src/Makefile @@ -118,7 +118,7 @@ endif # MSYS2 ## You have your own headers somewhere, for example: apt-get install opencl-headers ## -OPENCL_HEADERS_KHRONOS := deps/OpenCL-Headers +OPENCL_HEADERS_KHRONOS := deps/git/OpenCL-Headers ## ## Cross compiler paths