From: Yang Rong <[email protected]>
Signed-off-by: Yang Rong <[email protected]>
---
include/CL/cl.h | 12 ++++++------
include/CL/cl_ext.h | 2 +-
include/CL/cl_platform.h | 32 ++++++++++++++++++++------------
3 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/include/CL/cl.h b/include/CL/cl.h
index 87fd6d7..84d8a0a 100644
--- a/include/CL/cl.h
+++ b/include/CL/cl.h
@@ -1355,26 +1355,26 @@ extern CL_API_ENTRY
CL_EXT_PREFIX__VERSION_1_1_DEPRECATED void * CL_API_CALL
clGetExtensionFunctionAddress(const char * /* func_name */)
CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
/* Deprecated OpenCL 2.0 APIs */
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_2_0_DEPRECATED cl_command_queue
CL_API_CALL
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_command_queue
CL_API_CALL
clCreateCommandQueue(cl_context /* context */,
cl_device_id /* device */,
cl_command_queue_properties /* properties */,
- cl_int * /* errcode_ret */)
CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED;
+ cl_int * /* errcode_ret */)
CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED;
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_2_0_DEPRECATED cl_sampler
CL_API_CALL
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_sampler
CL_API_CALL
clCreateSampler(cl_context /* context */,
cl_bool /* normalized_coords */,
cl_addressing_mode /* addressing_mode */,
cl_filter_mode /* filter_mode */,
- cl_int * /* errcode_ret */)
CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED;
+ cl_int * /* errcode_ret */)
CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED;
-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_2_0_DEPRECATED cl_int CL_API_CALL
+extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_2_DEPRECATED cl_int CL_API_CALL
clEnqueueTask(cl_command_queue /* command_queue */,
cl_kernel /* kernel */,
cl_uint /* num_events_in_wait_list */,
const cl_event * /* event_wait_list */,
- cl_event * /* event */)
CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED;
+ cl_event * /* event */)
CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED;
#ifdef __cplusplus
}
diff --git a/include/CL/cl_ext.h b/include/CL/cl_ext.h
index cc9457a..bc9be7d 100644
--- a/include/CL/cl_ext.h
+++ b/include/CL/cl_ext.h
@@ -327,7 +327,7 @@ clGetKernelSubGroupInfoKHR(cl_kernel /* in_kernel */,
cl_kernel_sub_group_info /*
param_name */,
size_t /*input_value_size*/,
const void * /*input_value*/,
- size_t *
/*param_value_size*/,
+ size_t /*param_value_size*/,
void* /*param_value*/,
size_t*
/*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0;
diff --git a/include/CL/cl_platform.h b/include/CL/cl_platform.h
index 9e455fd..a2e52f0 100644
--- a/include/CL/cl_platform.h
+++ b/include/CL/cl_platform.h
@@ -45,6 +45,14 @@ extern "C" {
#define CL_CALLBACK
#endif
+/*
+ * Deprecation flags refer to the last version of the header in which the
+ * feature was not deprecated.
+ *
+ * E.g. VERSION_1_1_DEPRECATED means the feature is present in 1.1 without
+ * deprecation but is deprecated in versions later than 1.1.
+ */
+
#ifdef __APPLE__
#define CL_EXTENSION_WEAK_LINK __attribute__((weak_import))
#define CL_API_SUFFIX__VERSION_1_0
AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
@@ -95,12 +103,12 @@ extern "C" {
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
#endif
- #ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS
- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
+ #ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS
+ #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#else
- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
__attribute__((deprecated))
- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
+ #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
__attribute__((deprecated))
+ #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#endif
#elif _WIN32
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
@@ -119,12 +127,12 @@ extern "C" {
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
__declspec(deprecated)
#endif
- #ifdef CL_USE_DEPRECATED_OPENCL_2_0_APIS
- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
+ #ifdef CL_USE_DEPRECATED_OPENCL_1_2_APIS
+ #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#else
- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
__declspec(deprecated)
+ #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
__declspec(deprecated)
#endif
#else
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
@@ -133,8 +141,8 @@ extern "C" {
#define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
- #define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
- #define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
+ #define CL_EXT_SUFFIX__VERSION_1_2_DEPRECATED
+ #define CL_EXT_PREFIX__VERSION_1_2_DEPRECATED
#endif
#endif
--
1.9.1
_______________________________________________
Beignet mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/beignet
