P4 to Git Change 1117081 by lmoriche@lmoriche_opencl_dev on 2015/01/30 15:36:44

ECR #304775 - Add the new OpenCL 2.1 function declarations and enums.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.h#2 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#2 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_platform.h#2 edit


[ROCm/clr commit: c1c4e74321]
Этот коммит содержится в:
foreman
2015-01-30 15:50:01 -05:00
родитель c3c991322b
Коммит 8782b1bf4d
3 изменённых файлов: 65 добавлений и 2 удалений
+24 -1
Просмотреть файл
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008 - 2013 The Khronos Group Inc.
* Copyright (c) 2008 - 2015 The Khronos Group Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and/or associated documentation files (the
@@ -196,6 +196,7 @@ typedef struct _cl_buffer_region {
#define CL_VERSION_1_1 1
#define CL_VERSION_1_2 1
#define CL_VERSION_2_0 1
#define CL_VERSION_2_1 1
/* cl_bool */
#define CL_FALSE 0
@@ -662,6 +663,15 @@ clGetDeviceInfo(cl_device_id /* device */,
size_t /* param_value_size */,
void * /* param_value */,
size_t * /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
extern CL_API_ENTRY cl_int CL_API_CALL
clGetDeviceAndHostTimer(cl_device_id /* device */,
cl_ulong * /* device_timestamp */,
cl_ulong * /* host_timestamp */) CL_API_SUFFIX__VERSION_2_1;
extern CL_API_ENTRY cl_int CL_API_CALL
clGetHostTimer(cl_device_id /* device */,
cl_ulong * /* host_timestamp */) CL_API_SUFFIX__VERSION_2_1;
extern CL_API_ENTRY cl_int CL_API_CALL
clCreateSubDevices(cl_device_id /* in_device */,
@@ -940,6 +950,10 @@ clSetKernelExecInfo(cl_kernel /* kernel */,
cl_kernel_exec_info /* param_name */,
size_t /* param_value_size */,
const void * /* param_value */) CL_API_SUFFIX__VERSION_2_0;
extern CL_API_ENTRY cl_kernel CL_API_CALL
clCloneKernel(const cl_kernel /* source_kernel */,
cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_2_1;
extern CL_API_ENTRY cl_int CL_API_CALL
clGetKernelInfo(cl_kernel /* kernel */,
@@ -1300,6 +1314,15 @@ clEnqueueSVMUnmap(cl_command_queue /* command_queue */,
const cl_event * /* event_wait_list */,
cl_event * /* event */) CL_API_SUFFIX__VERSION_2_0;
extern CL_API_ENTRY cl_int CL_API_CALL
clEnqueueSVMMigrateMem(cl_command_queue /* command_queue */,
cl_uint /* num_svm_pointers */,
const void ** /* svm_pointers */,
const size_t * /* sizes */,
cl_mem_migration_flags /* flags */,
cl_uint /* num_events_in_wait_list */,
const cl_event * /* event_wait_list */,
cl_event * /* event */) CL_API_SUFFIX__VERSION_2_1;
/* Extension function access
*
+19
Просмотреть файл
@@ -482,6 +482,25 @@ typedef CL_API_ENTRY cl_int
size_t* /*param_value_size_ret*/ ) CL_EXT_SUFFIX__VERSION_2_0;
#endif /* CL_VERSION_2_0 */
#ifdef CL_VERSION_2_1
/*********************************
* cl_khr_priority_hints extension
*********************************/
#define cl_khr_priority_hints 1
/* cl_command_queue_properties */
#define CL_QUEUE_PRIORITY_KHR 0x0000
#define CL_QUEUE_PRIORITY_HIGH_KHR (3 << 16)
#define CL_QUEUE_PRIORITY_MED_KHR (2 << 16)
#define CL_QUEUE_PRIORITY_LOW_KHR (1 << 16)
#define CL_QUEUE_THROTTLE_KHR 0x0000
#define CL_QUEUE_THROTTLE_HIGH_KHR (3 << 16)
#define CL_QUEUE_THROTTLE_MED_KHR (2 << 16)
#define CL_QUEUE_THROTTLE_LOW_KHR (1 << 16)
#endif /* CL_VERSION_2_1 */
#ifdef __cplusplus
}
#endif
+22 -1
Просмотреть файл
@@ -77,6 +77,8 @@ extern "C" {
#define CL_EXT_SUFFIX__VERSION_1_2
#define CL_API_SUFFIX__VERSION_2_0
#define CL_EXT_SUFFIX__VERSION_2_0
#define CL_API_SUFFIX__VERSION_2_1
#define CL_EXT_SUFFIX__VERSION_2_1
#ifdef __GNUC__
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
@@ -101,7 +103,15 @@ extern "C" {
#else
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
#endif
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED __attribute__((deprecated))
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#endif
#elif _WIN32
#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
@@ -126,6 +136,14 @@ extern "C" {
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED __declspec(deprecated)
#endif
#ifdef CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#else
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED __declspec(deprecated)
#endif
#else
#define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
@@ -135,6 +153,9 @@ extern "C" {
#define CL_EXT_SUFFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_0_DEPRECATED
#define CL_EXT_SUFFIX__VERSION_2_1_DEPRECATED
#define CL_EXT_PREFIX__VERSION_2_1_DEPRECATED
#endif
#endif