[oclgrind] 01/05: Use opencl-headers instead of local copy of CL/*.h headers

James Price jprice-guest at moszumanska.debian.org
Tue Dec 8 19:48:27 UTC 2015


This is an automated email from the git hooks/post-receive script.

jprice-guest pushed a commit to branch master
in repository oclgrind.

commit ea4338e4080fd2a2d2dc369eecc2e9846490c0dc
Author: James Price <j.price at bristol.ac.uk>
Date:   Tue Dec 8 19:23:04 2015 +0000

    Use opencl-headers instead of local copy of CL/*.h headers
---
 debian/control                          |    1 +
 debian/patches/altivec_fix.patch        |   29 -
 debian/patches/series                   |    2 +-
 debian/patches/use-opencl-headers.patch | 3678 +++++++++++++++++++++++++++++++
 4 files changed, 3680 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index d6ed6ce..39bc90f 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  libedit-dev,
  zlib1g-dev,
  libreadline-dev,
+ opencl-headers,
  python (>= 2.7),
 Standards-Version: 3.9.6
 Homepage: https://github.com/jrprice/Oclgrind
diff --git a/debian/patches/altivec_fix.patch b/debian/patches/altivec_fix.patch
deleted file mode 100644
index 9c96a8e..0000000
--- a/debian/patches/altivec_fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Replace vector with __vector and undef altivec macros
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-12-08
---- a/src/CL/cl_platform.h
-+++ b/src/CL/cl_platform.h
-@@ -332,13 +332,16 @@
- /* Define basic vector types */
- #if defined( __VEC__ )
-    #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
--   typedef vector unsigned char     __cl_uchar16;
--   typedef vector signed char       __cl_char16;
--   typedef vector unsigned short    __cl_ushort8;
--   typedef vector signed short      __cl_short8;
--   typedef vector unsigned int      __cl_uint4;
--   typedef vector signed int        __cl_int4;
--   typedef vector float             __cl_float4;
-+   #undef vector
-+   #undef bool
-+   #undef pixel
-+   typedef __vector unsigned char     __cl_uchar16;
-+   typedef __vector signed char       __cl_char16;
-+   typedef __vector unsigned short    __cl_ushort8;
-+   typedef __vector signed short      __cl_short8;
-+   typedef __vector unsigned int      __cl_uint4;
-+   typedef __vector signed int        __cl_int4;
-+   typedef __vector float             __cl_float4;
-    #define  __CL_UCHAR16__  1
-    #define  __CL_CHAR16__   1
-    #define  __CL_USHORT8__  1
diff --git a/debian/patches/series b/debian/patches/series
index 48f5755..bc31e17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,4 @@ pch-location.patch
 clang-library-order.patch
 cmake-preserve-flags.patch
 i386-shift-width.patch
-altivec_fix.patch
+use-opencl-headers.patch
diff --git a/debian/patches/use-opencl-headers.patch b/debian/patches/use-opencl-headers.patch
new file mode 100644
index 0000000..0ed31e9
--- /dev/null
+++ b/debian/patches/use-opencl-headers.patch
@@ -0,0 +1,3678 @@
+Author: James Price <j.price at bristol.ac.uk>
+Description: Don't use local copy of CL/ headers
+Last-Update: 2015-12-08
+--- a/src/CL/cl.h
++++ /dev/null
+@@ -1,1214 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2008 - 2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- ******************************************************************************/
+-
+-#ifndef __OPENCL_CL_H
+-#define __OPENCL_CL_H
+-
+-#ifdef __APPLE__
+-#include <OpenCL/cl_platform.h>
+-#else
+-#include <CL/cl_platform.h>
+-#endif	
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/******************************************************************************/
+-
+-typedef struct _cl_platform_id *    cl_platform_id;
+-typedef struct _cl_device_id *      cl_device_id;
+-typedef struct _cl_context *        cl_context;
+-typedef struct _cl_command_queue *  cl_command_queue;
+-typedef struct _cl_mem *            cl_mem;
+-typedef struct _cl_program *        cl_program;
+-typedef struct _cl_kernel *         cl_kernel;
+-typedef struct _cl_event *          cl_event;
+-typedef struct _cl_sampler *        cl_sampler;
+-
+-typedef cl_uint             cl_bool;                     /* WARNING!  Unlike cl_ types in cl_platform.h, cl_bool is not guaranteed to be the same size as the bool in kernels. */ 
+-typedef cl_ulong            cl_bitfield;
+-typedef cl_bitfield         cl_device_type;
+-typedef cl_uint             cl_platform_info;
+-typedef cl_uint             cl_device_info;
+-typedef cl_bitfield         cl_device_fp_config;
+-typedef cl_uint             cl_device_mem_cache_type;
+-typedef cl_uint             cl_device_local_mem_type;
+-typedef cl_bitfield         cl_device_exec_capabilities;
+-typedef cl_bitfield         cl_command_queue_properties;
+-typedef intptr_t            cl_device_partition_property;
+-typedef cl_bitfield         cl_device_affinity_domain;
+-
+-typedef intptr_t            cl_context_properties;
+-typedef cl_uint             cl_context_info;
+-typedef cl_uint             cl_command_queue_info;
+-typedef cl_uint             cl_channel_order;
+-typedef cl_uint             cl_channel_type;
+-typedef cl_bitfield         cl_mem_flags;
+-typedef cl_uint             cl_mem_object_type;
+-typedef cl_uint             cl_mem_info;
+-typedef cl_bitfield         cl_mem_migration_flags;
+-typedef cl_uint             cl_image_info;
+-typedef cl_uint             cl_buffer_create_type;
+-typedef cl_uint             cl_addressing_mode;
+-typedef cl_uint             cl_filter_mode;
+-typedef cl_uint             cl_sampler_info;
+-typedef cl_bitfield         cl_map_flags;
+-typedef cl_uint             cl_program_info;
+-typedef cl_uint             cl_program_build_info;
+-typedef cl_uint             cl_program_binary_type;
+-typedef cl_int              cl_build_status;
+-typedef cl_uint             cl_kernel_info;
+-typedef cl_uint             cl_kernel_arg_info;
+-typedef cl_uint             cl_kernel_arg_address_qualifier;
+-typedef cl_uint             cl_kernel_arg_access_qualifier;
+-typedef cl_bitfield         cl_kernel_arg_type_qualifier;
+-typedef cl_uint             cl_kernel_work_group_info;
+-typedef cl_uint             cl_event_info;
+-typedef cl_uint             cl_command_type;
+-typedef cl_uint             cl_profiling_info;
+-
+-
+-typedef struct _cl_image_format {
+-    cl_channel_order        image_channel_order;
+-    cl_channel_type         image_channel_data_type;
+-} cl_image_format;
+-
+-typedef struct _cl_image_desc {
+-    cl_mem_object_type      image_type;
+-    size_t                  image_width;
+-    size_t                  image_height;
+-    size_t                  image_depth;
+-    size_t                  image_array_size;
+-    size_t                  image_row_pitch;
+-    size_t                  image_slice_pitch;
+-    cl_uint                 num_mip_levels;
+-    cl_uint                 num_samples;
+-    cl_mem                  buffer;
+-} cl_image_desc;
+-
+-typedef struct _cl_buffer_region {
+-    size_t                  origin;
+-    size_t                  size;
+-} cl_buffer_region;
+-
+-
+-/******************************************************************************/
+-
+-/* Error Codes */
+-#define CL_SUCCESS                                  0
+-#define CL_DEVICE_NOT_FOUND                         -1
+-#define CL_DEVICE_NOT_AVAILABLE                     -2
+-#define CL_COMPILER_NOT_AVAILABLE                   -3
+-#define CL_MEM_OBJECT_ALLOCATION_FAILURE            -4
+-#define CL_OUT_OF_RESOURCES                         -5
+-#define CL_OUT_OF_HOST_MEMORY                       -6
+-#define CL_PROFILING_INFO_NOT_AVAILABLE             -7
+-#define CL_MEM_COPY_OVERLAP                         -8
+-#define CL_IMAGE_FORMAT_MISMATCH                    -9
+-#define CL_IMAGE_FORMAT_NOT_SUPPORTED               -10
+-#define CL_BUILD_PROGRAM_FAILURE                    -11
+-#define CL_MAP_FAILURE                              -12
+-#define CL_MISALIGNED_SUB_BUFFER_OFFSET             -13
+-#define CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST -14
+-#define CL_COMPILE_PROGRAM_FAILURE                  -15
+-#define CL_LINKER_NOT_AVAILABLE                     -16
+-#define CL_LINK_PROGRAM_FAILURE                     -17
+-#define CL_DEVICE_PARTITION_FAILED                  -18
+-#define CL_KERNEL_ARG_INFO_NOT_AVAILABLE            -19
+-
+-#define CL_INVALID_VALUE                            -30
+-#define CL_INVALID_DEVICE_TYPE                      -31
+-#define CL_INVALID_PLATFORM                         -32
+-#define CL_INVALID_DEVICE                           -33
+-#define CL_INVALID_CONTEXT                          -34
+-#define CL_INVALID_QUEUE_PROPERTIES                 -35
+-#define CL_INVALID_COMMAND_QUEUE                    -36
+-#define CL_INVALID_HOST_PTR                         -37
+-#define CL_INVALID_MEM_OBJECT                       -38
+-#define CL_INVALID_IMAGE_FORMAT_DESCRIPTOR          -39
+-#define CL_INVALID_IMAGE_SIZE                       -40
+-#define CL_INVALID_SAMPLER                          -41
+-#define CL_INVALID_BINARY                           -42
+-#define CL_INVALID_BUILD_OPTIONS                    -43
+-#define CL_INVALID_PROGRAM                          -44
+-#define CL_INVALID_PROGRAM_EXECUTABLE               -45
+-#define CL_INVALID_KERNEL_NAME                      -46
+-#define CL_INVALID_KERNEL_DEFINITION                -47
+-#define CL_INVALID_KERNEL                           -48
+-#define CL_INVALID_ARG_INDEX                        -49
+-#define CL_INVALID_ARG_VALUE                        -50
+-#define CL_INVALID_ARG_SIZE                         -51
+-#define CL_INVALID_KERNEL_ARGS                      -52
+-#define CL_INVALID_WORK_DIMENSION                   -53
+-#define CL_INVALID_WORK_GROUP_SIZE                  -54
+-#define CL_INVALID_WORK_ITEM_SIZE                   -55
+-#define CL_INVALID_GLOBAL_OFFSET                    -56
+-#define CL_INVALID_EVENT_WAIT_LIST                  -57
+-#define CL_INVALID_EVENT                            -58
+-#define CL_INVALID_OPERATION                        -59
+-#define CL_INVALID_GL_OBJECT                        -60
+-#define CL_INVALID_BUFFER_SIZE                      -61
+-#define CL_INVALID_MIP_LEVEL                        -62
+-#define CL_INVALID_GLOBAL_WORK_SIZE                 -63
+-#define CL_INVALID_PROPERTY                         -64
+-#define CL_INVALID_IMAGE_DESCRIPTOR                 -65
+-#define CL_INVALID_COMPILER_OPTIONS                 -66
+-#define CL_INVALID_LINKER_OPTIONS                   -67
+-#define CL_INVALID_DEVICE_PARTITION_COUNT           -68
+-
+-/* OpenCL Version */
+-#define CL_VERSION_1_0                              1
+-#define CL_VERSION_1_1                              1
+-#define CL_VERSION_1_2                              1
+-
+-/* cl_bool */
+-#define CL_FALSE                                    0
+-#define CL_TRUE                                     1
+-#define CL_BLOCKING                                 CL_TRUE
+-#define CL_NON_BLOCKING                             CL_FALSE
+-
+-/* cl_platform_info */
+-#define CL_PLATFORM_PROFILE                         0x0900
+-#define CL_PLATFORM_VERSION                         0x0901
+-#define CL_PLATFORM_NAME                            0x0902
+-#define CL_PLATFORM_VENDOR                          0x0903
+-#define CL_PLATFORM_EXTENSIONS                      0x0904
+-
+-/* cl_device_type - bitfield */
+-#define CL_DEVICE_TYPE_DEFAULT                      (1 << 0)
+-#define CL_DEVICE_TYPE_CPU                          (1 << 1)
+-#define CL_DEVICE_TYPE_GPU                          (1 << 2)
+-#define CL_DEVICE_TYPE_ACCELERATOR                  (1 << 3)
+-#define CL_DEVICE_TYPE_CUSTOM                       (1 << 4)
+-#define CL_DEVICE_TYPE_ALL                          0xFFFFFFFF
+-
+-/* cl_device_info */
+-#define CL_DEVICE_TYPE                              0x1000
+-#define CL_DEVICE_VENDOR_ID                         0x1001
+-#define CL_DEVICE_MAX_COMPUTE_UNITS                 0x1002
+-#define CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS          0x1003
+-#define CL_DEVICE_MAX_WORK_GROUP_SIZE               0x1004
+-#define CL_DEVICE_MAX_WORK_ITEM_SIZES               0x1005
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_CHAR       0x1006
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_SHORT      0x1007
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_INT        0x1008
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_LONG       0x1009
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT      0x100A
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_DOUBLE     0x100B
+-#define CL_DEVICE_MAX_CLOCK_FREQUENCY               0x100C
+-#define CL_DEVICE_ADDRESS_BITS                      0x100D
+-#define CL_DEVICE_MAX_READ_IMAGE_ARGS               0x100E
+-#define CL_DEVICE_MAX_WRITE_IMAGE_ARGS              0x100F
+-#define CL_DEVICE_MAX_MEM_ALLOC_SIZE                0x1010
+-#define CL_DEVICE_IMAGE2D_MAX_WIDTH                 0x1011
+-#define CL_DEVICE_IMAGE2D_MAX_HEIGHT                0x1012
+-#define CL_DEVICE_IMAGE3D_MAX_WIDTH                 0x1013
+-#define CL_DEVICE_IMAGE3D_MAX_HEIGHT                0x1014
+-#define CL_DEVICE_IMAGE3D_MAX_DEPTH                 0x1015
+-#define CL_DEVICE_IMAGE_SUPPORT                     0x1016
+-#define CL_DEVICE_MAX_PARAMETER_SIZE                0x1017
+-#define CL_DEVICE_MAX_SAMPLERS                      0x1018
+-#define CL_DEVICE_MEM_BASE_ADDR_ALIGN               0x1019
+-#define CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE          0x101A
+-#define CL_DEVICE_SINGLE_FP_CONFIG                  0x101B
+-#define CL_DEVICE_GLOBAL_MEM_CACHE_TYPE             0x101C
+-#define CL_DEVICE_GLOBAL_MEM_CACHELINE_SIZE         0x101D
+-#define CL_DEVICE_GLOBAL_MEM_CACHE_SIZE             0x101E
+-#define CL_DEVICE_GLOBAL_MEM_SIZE                   0x101F
+-#define CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE          0x1020
+-#define CL_DEVICE_MAX_CONSTANT_ARGS                 0x1021
+-#define CL_DEVICE_LOCAL_MEM_TYPE                    0x1022
+-#define CL_DEVICE_LOCAL_MEM_SIZE                    0x1023
+-#define CL_DEVICE_ERROR_CORRECTION_SUPPORT          0x1024
+-#define CL_DEVICE_PROFILING_TIMER_RESOLUTION        0x1025
+-#define CL_DEVICE_ENDIAN_LITTLE                     0x1026
+-#define CL_DEVICE_AVAILABLE                         0x1027
+-#define CL_DEVICE_COMPILER_AVAILABLE                0x1028
+-#define CL_DEVICE_EXECUTION_CAPABILITIES            0x1029
+-#define CL_DEVICE_QUEUE_PROPERTIES                  0x102A
+-#define CL_DEVICE_NAME                              0x102B
+-#define CL_DEVICE_VENDOR                            0x102C
+-#define CL_DRIVER_VERSION                           0x102D
+-#define CL_DEVICE_PROFILE                           0x102E
+-#define CL_DEVICE_VERSION                           0x102F
+-#define CL_DEVICE_EXTENSIONS                        0x1030
+-#define CL_DEVICE_PLATFORM                          0x1031
+-#define CL_DEVICE_DOUBLE_FP_CONFIG                  0x1032
+-/* 0x1033 reserved for CL_DEVICE_HALF_FP_CONFIG */
+-#define CL_DEVICE_PREFERRED_VECTOR_WIDTH_HALF       0x1034
+-#define CL_DEVICE_HOST_UNIFIED_MEMORY               0x1035
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR          0x1036
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_SHORT         0x1037
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_INT           0x1038
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG          0x1039
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_FLOAT         0x103A
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_DOUBLE        0x103B
+-#define CL_DEVICE_NATIVE_VECTOR_WIDTH_HALF          0x103C
+-#define CL_DEVICE_OPENCL_C_VERSION                  0x103D
+-#define CL_DEVICE_LINKER_AVAILABLE                  0x103E
+-#define CL_DEVICE_BUILT_IN_KERNELS                  0x103F
+-#define CL_DEVICE_IMAGE_MAX_BUFFER_SIZE             0x1040
+-#define CL_DEVICE_IMAGE_MAX_ARRAY_SIZE              0x1041
+-#define CL_DEVICE_PARENT_DEVICE                     0x1042
+-#define CL_DEVICE_PARTITION_MAX_SUB_DEVICES         0x1043
+-#define CL_DEVICE_PARTITION_PROPERTIES              0x1044
+-#define CL_DEVICE_PARTITION_AFFINITY_DOMAIN         0x1045
+-#define CL_DEVICE_PARTITION_TYPE                    0x1046
+-#define CL_DEVICE_REFERENCE_COUNT                   0x1047
+-#define CL_DEVICE_PREFERRED_INTEROP_USER_SYNC       0x1048
+-#define CL_DEVICE_PRINTF_BUFFER_SIZE                0x1049
+-#define CL_DEVICE_IMAGE_PITCH_ALIGNMENT             0x104A
+-#define CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT      0x104B
+-
+-/* cl_device_fp_config - bitfield */
+-#define CL_FP_DENORM                                (1 << 0)
+-#define CL_FP_INF_NAN                               (1 << 1)
+-#define CL_FP_ROUND_TO_NEAREST                      (1 << 2)
+-#define CL_FP_ROUND_TO_ZERO                         (1 << 3)
+-#define CL_FP_ROUND_TO_INF                          (1 << 4)
+-#define CL_FP_FMA                                   (1 << 5)
+-#define CL_FP_SOFT_FLOAT                            (1 << 6)
+-#define CL_FP_CORRECTLY_ROUNDED_DIVIDE_SQRT         (1 << 7)
+-
+-/* cl_device_mem_cache_type */
+-#define CL_NONE                                     0x0
+-#define CL_READ_ONLY_CACHE                          0x1
+-#define CL_READ_WRITE_CACHE                         0x2
+-
+-/* cl_device_local_mem_type */
+-#define CL_LOCAL                                    0x1
+-#define CL_GLOBAL                                   0x2
+-
+-/* cl_device_exec_capabilities - bitfield */
+-#define CL_EXEC_KERNEL                              (1 << 0)
+-#define CL_EXEC_NATIVE_KERNEL                       (1 << 1)
+-
+-/* cl_command_queue_properties - bitfield */
+-#define CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE      (1 << 0)
+-#define CL_QUEUE_PROFILING_ENABLE                   (1 << 1)
+-
+-/* cl_context_info  */
+-#define CL_CONTEXT_REFERENCE_COUNT                  0x1080
+-#define CL_CONTEXT_DEVICES                          0x1081
+-#define CL_CONTEXT_PROPERTIES                       0x1082
+-#define CL_CONTEXT_NUM_DEVICES                      0x1083
+-
+-/* cl_context_properties */
+-#define CL_CONTEXT_PLATFORM                         0x1084
+-#define CL_CONTEXT_INTEROP_USER_SYNC                0x1085
+-    
+-/* cl_device_partition_property */
+-#define CL_DEVICE_PARTITION_EQUALLY                 0x1086
+-#define CL_DEVICE_PARTITION_BY_COUNTS               0x1087
+-#define CL_DEVICE_PARTITION_BY_COUNTS_LIST_END      0x0
+-#define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN      0x1088
+-    
+-/* cl_device_affinity_domain */
+-#define CL_DEVICE_AFFINITY_DOMAIN_NUMA                     (1 << 0)
+-#define CL_DEVICE_AFFINITY_DOMAIN_L4_CACHE                 (1 << 1)
+-#define CL_DEVICE_AFFINITY_DOMAIN_L3_CACHE                 (1 << 2)
+-#define CL_DEVICE_AFFINITY_DOMAIN_L2_CACHE                 (1 << 3)
+-#define CL_DEVICE_AFFINITY_DOMAIN_L1_CACHE                 (1 << 4)
+-#define CL_DEVICE_AFFINITY_DOMAIN_NEXT_PARTITIONABLE       (1 << 5)
+-
+-/* cl_command_queue_info */
+-#define CL_QUEUE_CONTEXT                            0x1090
+-#define CL_QUEUE_DEVICE                             0x1091
+-#define CL_QUEUE_REFERENCE_COUNT                    0x1092
+-#define CL_QUEUE_PROPERTIES                         0x1093
+-
+-/* cl_mem_flags - bitfield */
+-#define CL_MEM_READ_WRITE                           (1 << 0)
+-#define CL_MEM_WRITE_ONLY                           (1 << 1)
+-#define CL_MEM_READ_ONLY                            (1 << 2)
+-#define CL_MEM_USE_HOST_PTR                         (1 << 3)
+-#define CL_MEM_ALLOC_HOST_PTR                       (1 << 4)
+-#define CL_MEM_COPY_HOST_PTR                        (1 << 5)
+-// reserved                                         (1 << 6)    
+-#define CL_MEM_HOST_WRITE_ONLY                      (1 << 7)
+-#define CL_MEM_HOST_READ_ONLY                       (1 << 8)
+-#define CL_MEM_HOST_NO_ACCESS                       (1 << 9)
+-
+-/* cl_mem_migration_flags - bitfield */
+-#define CL_MIGRATE_MEM_OBJECT_HOST                  (1 << 0)
+-#define CL_MIGRATE_MEM_OBJECT_CONTENT_UNDEFINED     (1 << 1)
+-
+-/* cl_channel_order */
+-#define CL_R                                        0x10B0
+-#define CL_A                                        0x10B1
+-#define CL_RG                                       0x10B2
+-#define CL_RA                                       0x10B3
+-#define CL_RGB                                      0x10B4
+-#define CL_RGBA                                     0x10B5
+-#define CL_BGRA                                     0x10B6
+-#define CL_ARGB                                     0x10B7
+-#define CL_INTENSITY                                0x10B8
+-#define CL_LUMINANCE                                0x10B9
+-#define CL_Rx                                       0x10BA
+-#define CL_RGx                                      0x10BB
+-#define CL_RGBx                                     0x10BC
+-#define CL_DEPTH                                    0x10BD
+-#define CL_DEPTH_STENCIL                            0x10BE
+-
+-/* cl_channel_type */
+-#define CL_SNORM_INT8                               0x10D0
+-#define CL_SNORM_INT16                              0x10D1
+-#define CL_UNORM_INT8                               0x10D2
+-#define CL_UNORM_INT16                              0x10D3
+-#define CL_UNORM_SHORT_565                          0x10D4
+-#define CL_UNORM_SHORT_555                          0x10D5
+-#define CL_UNORM_INT_101010                         0x10D6
+-#define CL_SIGNED_INT8                              0x10D7
+-#define CL_SIGNED_INT16                             0x10D8
+-#define CL_SIGNED_INT32                             0x10D9
+-#define CL_UNSIGNED_INT8                            0x10DA
+-#define CL_UNSIGNED_INT16                           0x10DB
+-#define CL_UNSIGNED_INT32                           0x10DC
+-#define CL_HALF_FLOAT                               0x10DD
+-#define CL_FLOAT                                    0x10DE
+-#define CL_UNORM_INT24                              0x10DF
+-
+-/* cl_mem_object_type */
+-#define CL_MEM_OBJECT_BUFFER                        0x10F0
+-#define CL_MEM_OBJECT_IMAGE2D                       0x10F1
+-#define CL_MEM_OBJECT_IMAGE3D                       0x10F2
+-#define CL_MEM_OBJECT_IMAGE2D_ARRAY                 0x10F3
+-#define CL_MEM_OBJECT_IMAGE1D                       0x10F4
+-#define CL_MEM_OBJECT_IMAGE1D_ARRAY                 0x10F5
+-#define CL_MEM_OBJECT_IMAGE1D_BUFFER                0x10F6
+-
+-/* cl_mem_info */
+-#define CL_MEM_TYPE                                 0x1100
+-#define CL_MEM_FLAGS                                0x1101
+-#define CL_MEM_SIZE                                 0x1102
+-#define CL_MEM_HOST_PTR                             0x1103
+-#define CL_MEM_MAP_COUNT                            0x1104
+-#define CL_MEM_REFERENCE_COUNT                      0x1105
+-#define CL_MEM_CONTEXT                              0x1106
+-#define CL_MEM_ASSOCIATED_MEMOBJECT                 0x1107
+-#define CL_MEM_OFFSET                               0x1108
+-
+-/* cl_image_info */
+-#define CL_IMAGE_FORMAT                             0x1110
+-#define CL_IMAGE_ELEMENT_SIZE                       0x1111
+-#define CL_IMAGE_ROW_PITCH                          0x1112
+-#define CL_IMAGE_SLICE_PITCH                        0x1113
+-#define CL_IMAGE_WIDTH                              0x1114
+-#define CL_IMAGE_HEIGHT                             0x1115
+-#define CL_IMAGE_DEPTH                              0x1116
+-#define CL_IMAGE_ARRAY_SIZE                         0x1117
+-#define CL_IMAGE_BUFFER                             0x1118
+-#define CL_IMAGE_NUM_MIP_LEVELS                     0x1119
+-#define CL_IMAGE_NUM_SAMPLES                        0x111A
+-
+-/* cl_addressing_mode */
+-#define CL_ADDRESS_NONE                             0x1130
+-#define CL_ADDRESS_CLAMP_TO_EDGE                    0x1131
+-#define CL_ADDRESS_CLAMP                            0x1132
+-#define CL_ADDRESS_REPEAT                           0x1133
+-#define CL_ADDRESS_MIRRORED_REPEAT                  0x1134
+-
+-/* cl_filter_mode */
+-#define CL_FILTER_NEAREST                           0x1140
+-#define CL_FILTER_LINEAR                            0x1141
+-
+-/* cl_sampler_info */
+-#define CL_SAMPLER_REFERENCE_COUNT                  0x1150
+-#define CL_SAMPLER_CONTEXT                          0x1151
+-#define CL_SAMPLER_NORMALIZED_COORDS                0x1152
+-#define CL_SAMPLER_ADDRESSING_MODE                  0x1153
+-#define CL_SAMPLER_FILTER_MODE                      0x1154
+-
+-/* cl_map_flags - bitfield */
+-#define CL_MAP_READ                                 (1 << 0)
+-#define CL_MAP_WRITE                                (1 << 1)
+-#define CL_MAP_WRITE_INVALIDATE_REGION              (1 << 2)
+-
+-/* cl_program_info */
+-#define CL_PROGRAM_REFERENCE_COUNT                  0x1160
+-#define CL_PROGRAM_CONTEXT                          0x1161
+-#define CL_PROGRAM_NUM_DEVICES                      0x1162
+-#define CL_PROGRAM_DEVICES                          0x1163
+-#define CL_PROGRAM_SOURCE                           0x1164
+-#define CL_PROGRAM_BINARY_SIZES                     0x1165
+-#define CL_PROGRAM_BINARIES                         0x1166
+-#define CL_PROGRAM_NUM_KERNELS                      0x1167
+-#define CL_PROGRAM_KERNEL_NAMES                     0x1168
+-
+-/* cl_program_build_info */
+-#define CL_PROGRAM_BUILD_STATUS                     0x1181
+-#define CL_PROGRAM_BUILD_OPTIONS                    0x1182
+-#define CL_PROGRAM_BUILD_LOG                        0x1183
+-#define CL_PROGRAM_BINARY_TYPE                      0x1184
+-    
+-/* cl_program_binary_type */
+-#define CL_PROGRAM_BINARY_TYPE_NONE                 0x0
+-#define CL_PROGRAM_BINARY_TYPE_COMPILED_OBJECT      0x1
+-#define CL_PROGRAM_BINARY_TYPE_LIBRARY              0x2
+-#define CL_PROGRAM_BINARY_TYPE_EXECUTABLE           0x4
+-
+-/* cl_build_status */
+-#define CL_BUILD_SUCCESS                            0
+-#define CL_BUILD_NONE                               -1
+-#define CL_BUILD_ERROR                              -2
+-#define CL_BUILD_IN_PROGRESS                        -3
+-
+-/* cl_kernel_info */
+-#define CL_KERNEL_FUNCTION_NAME                     0x1190
+-#define CL_KERNEL_NUM_ARGS                          0x1191
+-#define CL_KERNEL_REFERENCE_COUNT                   0x1192
+-#define CL_KERNEL_CONTEXT                           0x1193
+-#define CL_KERNEL_PROGRAM                           0x1194
+-#define CL_KERNEL_ATTRIBUTES                        0x1195
+-
+-/* cl_kernel_arg_info */
+-#define CL_KERNEL_ARG_ADDRESS_QUALIFIER             0x1196
+-#define CL_KERNEL_ARG_ACCESS_QUALIFIER              0x1197
+-#define CL_KERNEL_ARG_TYPE_NAME                     0x1198
+-#define CL_KERNEL_ARG_TYPE_QUALIFIER                0x1199
+-#define CL_KERNEL_ARG_NAME                          0x119A
+-
+-/* cl_kernel_arg_address_qualifier */
+-#define CL_KERNEL_ARG_ADDRESS_GLOBAL                0x119B
+-#define CL_KERNEL_ARG_ADDRESS_LOCAL                 0x119C
+-#define CL_KERNEL_ARG_ADDRESS_CONSTANT              0x119D
+-#define CL_KERNEL_ARG_ADDRESS_PRIVATE               0x119E
+-
+-/* cl_kernel_arg_access_qualifier */
+-#define CL_KERNEL_ARG_ACCESS_READ_ONLY              0x11A0
+-#define CL_KERNEL_ARG_ACCESS_WRITE_ONLY             0x11A1
+-#define CL_KERNEL_ARG_ACCESS_READ_WRITE             0x11A2
+-#define CL_KERNEL_ARG_ACCESS_NONE                   0x11A3
+-    
+-/* cl_kernel_arg_type_qualifer */
+-#define CL_KERNEL_ARG_TYPE_NONE                     0
+-#define CL_KERNEL_ARG_TYPE_CONST                    (1 << 0)
+-#define CL_KERNEL_ARG_TYPE_RESTRICT                 (1 << 1)
+-#define CL_KERNEL_ARG_TYPE_VOLATILE                 (1 << 2)
+-
+-/* cl_kernel_work_group_info */
+-#define CL_KERNEL_WORK_GROUP_SIZE                   0x11B0
+-#define CL_KERNEL_COMPILE_WORK_GROUP_SIZE           0x11B1
+-#define CL_KERNEL_LOCAL_MEM_SIZE                    0x11B2
+-#define CL_KERNEL_PREFERRED_WORK_GROUP_SIZE_MULTIPLE 0x11B3
+-#define CL_KERNEL_PRIVATE_MEM_SIZE                  0x11B4
+-#define CL_KERNEL_GLOBAL_WORK_SIZE                  0x11B5
+-
+-/* cl_event_info  */
+-#define CL_EVENT_COMMAND_QUEUE                      0x11D0
+-#define CL_EVENT_COMMAND_TYPE                       0x11D1
+-#define CL_EVENT_REFERENCE_COUNT                    0x11D2
+-#define CL_EVENT_COMMAND_EXECUTION_STATUS           0x11D3
+-#define CL_EVENT_CONTEXT                            0x11D4
+-
+-/* cl_command_type */
+-#define CL_COMMAND_NDRANGE_KERNEL                   0x11F0
+-#define CL_COMMAND_TASK                             0x11F1
+-#define CL_COMMAND_NATIVE_KERNEL                    0x11F2
+-#define CL_COMMAND_READ_BUFFER                      0x11F3
+-#define CL_COMMAND_WRITE_BUFFER                     0x11F4
+-#define CL_COMMAND_COPY_BUFFER                      0x11F5
+-#define CL_COMMAND_READ_IMAGE                       0x11F6
+-#define CL_COMMAND_WRITE_IMAGE                      0x11F7
+-#define CL_COMMAND_COPY_IMAGE                       0x11F8
+-#define CL_COMMAND_COPY_IMAGE_TO_BUFFER             0x11F9
+-#define CL_COMMAND_COPY_BUFFER_TO_IMAGE             0x11FA
+-#define CL_COMMAND_MAP_BUFFER                       0x11FB
+-#define CL_COMMAND_MAP_IMAGE                        0x11FC
+-#define CL_COMMAND_UNMAP_MEM_OBJECT                 0x11FD
+-#define CL_COMMAND_MARKER                           0x11FE
+-#define CL_COMMAND_ACQUIRE_GL_OBJECTS               0x11FF
+-#define CL_COMMAND_RELEASE_GL_OBJECTS               0x1200
+-#define CL_COMMAND_READ_BUFFER_RECT                 0x1201
+-#define CL_COMMAND_WRITE_BUFFER_RECT                0x1202
+-#define CL_COMMAND_COPY_BUFFER_RECT                 0x1203
+-#define CL_COMMAND_USER                             0x1204
+-#define CL_COMMAND_BARRIER                          0x1205
+-#define CL_COMMAND_MIGRATE_MEM_OBJECTS              0x1206
+-#define CL_COMMAND_FILL_BUFFER                      0x1207
+-#define CL_COMMAND_FILL_IMAGE                       0x1208
+-
+-/* command execution status */
+-#define CL_COMPLETE                                 0x0
+-#define CL_RUNNING                                  0x1
+-#define CL_SUBMITTED                                0x2
+-#define CL_QUEUED                                   0x3
+-
+-/* cl_buffer_create_type  */
+-#define CL_BUFFER_CREATE_TYPE_REGION                0x1220
+-
+-/* cl_profiling_info  */
+-#define CL_PROFILING_COMMAND_QUEUED                 0x1280
+-#define CL_PROFILING_COMMAND_SUBMIT                 0x1281
+-#define CL_PROFILING_COMMAND_START                  0x1282
+-#define CL_PROFILING_COMMAND_END                    0x1283
+-
+-/********************************************************************************************************/
+-
+-/* Platform API */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetPlatformIDs(cl_uint          /* num_entries */,
+-                 cl_platform_id * /* platforms */,
+-                 cl_uint *        /* num_platforms */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL 
+-clGetPlatformInfo(cl_platform_id   /* platform */, 
+-                  cl_platform_info /* param_name */,
+-                  size_t           /* param_value_size */, 
+-                  void *           /* param_value */,
+-                  size_t *         /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-/* Device APIs */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetDeviceIDs(cl_platform_id   /* platform */,
+-               cl_device_type   /* device_type */, 
+-               cl_uint          /* num_entries */, 
+-               cl_device_id *   /* devices */, 
+-               cl_uint *        /* num_devices */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetDeviceInfo(cl_device_id    /* device */,
+-                cl_device_info  /* param_name */, 
+-                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
+-clCreateSubDevices(cl_device_id                         /* in_device */,
+-                   const cl_device_partition_property * /* properties */,
+-                   cl_uint                              /* num_devices */,
+-                   cl_device_id *                       /* out_devices */,
+-                   cl_uint *                            /* num_devices_ret */) CL_API_SUFFIX__VERSION_1_2;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2;
+-    
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseDevice(cl_device_id /* device */) CL_API_SUFFIX__VERSION_1_2;
+-    
+-/* Context APIs  */
+-extern CL_API_ENTRY cl_context CL_API_CALL
+-clCreateContext(const cl_context_properties * /* properties */,
+-                cl_uint                 /* num_devices */,
+-                const cl_device_id *    /* devices */,
+-                void (CL_CALLBACK * /* pfn_notify */)(const char *, const void *, size_t, void *),
+-                void *                  /* user_data */,
+-                cl_int *                /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_context CL_API_CALL
+-clCreateContextFromType(const cl_context_properties * /* properties */,
+-                        cl_device_type          /* device_type */,
+-                        void (CL_CALLBACK *     /* pfn_notify*/ )(const char *, const void *, size_t, void *),
+-                        void *                  /* user_data */,
+-                        cl_int *                /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseContext(cl_context /* context */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetContextInfo(cl_context         /* context */, 
+-                 cl_context_info    /* param_name */, 
+-                 size_t             /* param_value_size */, 
+-                 void *             /* param_value */, 
+-                 size_t *           /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-/* Command Queue APIs */
+-extern CL_API_ENTRY cl_command_queue CL_API_CALL
+-clCreateCommandQueue(cl_context                     /* context */, 
+-                     cl_device_id                   /* device */, 
+-                     cl_command_queue_properties    /* properties */,
+-                     cl_int *                       /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseCommandQueue(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetCommandQueueInfo(cl_command_queue      /* command_queue */,
+-                      cl_command_queue_info /* param_name */,
+-                      size_t                /* param_value_size */,
+-                      void *                /* param_value */,
+-                      size_t *              /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-/* Memory Object APIs */
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateBuffer(cl_context   /* context */,
+-               cl_mem_flags /* flags */,
+-               size_t       /* size */,
+-               void *       /* host_ptr */,
+-               cl_int *     /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateSubBuffer(cl_mem                   /* buffer */,
+-                  cl_mem_flags             /* flags */,
+-                  cl_buffer_create_type    /* buffer_create_type */,
+-                  const void *             /* buffer_create_info */,
+-                  cl_int *                 /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;
+-
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateImage(cl_context              /* context */,
+-              cl_mem_flags            /* flags */,
+-              const cl_image_format * /* image_format */,
+-              const cl_image_desc *   /* image_desc */, 
+-              void *                  /* host_ptr */,
+-              cl_int *                /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
+-                        
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseMemObject(cl_mem /* memobj */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetSupportedImageFormats(cl_context           /* context */,
+-                           cl_mem_flags         /* flags */,
+-                           cl_mem_object_type   /* image_type */,
+-                           cl_uint              /* num_entries */,
+-                           cl_image_format *    /* image_formats */,
+-                           cl_uint *            /* num_image_formats */) CL_API_SUFFIX__VERSION_1_0;
+-                                    
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetMemObjectInfo(cl_mem           /* memobj */,
+-                   cl_mem_info      /* param_name */, 
+-                   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
+-clGetImageInfo(cl_mem           /* image */,
+-               cl_image_info    /* param_name */, 
+-               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
+-clSetMemObjectDestructorCallback(  cl_mem /* memobj */, 
+-                                    void (CL_CALLBACK * /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), 
+-                                    void * /*user_data */ )             CL_API_SUFFIX__VERSION_1_1;  
+-
+-/* Sampler APIs */
+-extern CL_API_ENTRY 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_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseSampler(cl_sampler /* sampler */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetSamplerInfo(cl_sampler         /* sampler */,
+-                 cl_sampler_info    /* param_name */,
+-                 size_t             /* param_value_size */,
+-                 void *             /* param_value */,
+-                 size_t *           /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-                            
+-/* Program Object APIs  */
+-extern CL_API_ENTRY cl_program CL_API_CALL
+-clCreateProgramWithSource(cl_context        /* context */,
+-                          cl_uint           /* count */,
+-                          const char **     /* strings */,
+-                          const size_t *    /* lengths */,
+-                          cl_int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_program CL_API_CALL
+-clCreateProgramWithBinary(cl_context                     /* context */,
+-                          cl_uint                        /* num_devices */,
+-                          const cl_device_id *           /* device_list */,
+-                          const size_t *                 /* lengths */,
+-                          const unsigned char **         /* binaries */,
+-                          cl_int *                       /* binary_status */,
+-                          cl_int *                       /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_program CL_API_CALL
+-clCreateProgramWithBuiltInKernels(cl_context            /* context */,
+-                                  cl_uint               /* num_devices */,
+-                                  const cl_device_id *  /* device_list */,
+-                                  const char *          /* kernel_names */,
+-                                  cl_int *              /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseProgram(cl_program /* program */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clBuildProgram(cl_program           /* program */,
+-               cl_uint              /* num_devices */,
+-               const cl_device_id * /* device_list */,
+-               const char *         /* options */, 
+-               void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+-               void *               /* user_data */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clCompileProgram(cl_program           /* program */,
+-                 cl_uint              /* num_devices */,
+-                 const cl_device_id * /* device_list */,
+-                 const char *         /* options */, 
+-                 cl_uint              /* num_input_headers */,
+-                 const cl_program *   /* input_headers */,
+-                 const char **        /* header_include_names */,
+-                 void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+-                 void *               /* user_data */) CL_API_SUFFIX__VERSION_1_2;
+-
+-extern CL_API_ENTRY cl_program CL_API_CALL
+-clLinkProgram(cl_context           /* context */,
+-              cl_uint              /* num_devices */,
+-              const cl_device_id * /* device_list */,
+-              const char *         /* options */, 
+-              cl_uint              /* num_input_programs */,
+-              const cl_program *   /* input_programs */,
+-              void (CL_CALLBACK *  /* pfn_notify */)(cl_program /* program */, void * /* user_data */),
+-              void *               /* user_data */,
+-              cl_int *             /* errcode_ret */ ) CL_API_SUFFIX__VERSION_1_2;
+-
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clUnloadPlatformCompiler(cl_platform_id /* platform */) CL_API_SUFFIX__VERSION_1_2;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetProgramInfo(cl_program         /* program */,
+-                 cl_program_info    /* param_name */,
+-                 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
+-clGetProgramBuildInfo(cl_program            /* program */,
+-                      cl_device_id          /* device */,
+-                      cl_program_build_info /* param_name */,
+-                      size_t                /* param_value_size */,
+-                      void *                /* param_value */,
+-                      size_t *              /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-                            
+-/* Kernel Object APIs */
+-extern CL_API_ENTRY cl_kernel CL_API_CALL
+-clCreateKernel(cl_program      /* program */,
+-               const char *    /* kernel_name */,
+-               cl_int *        /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clCreateKernelsInProgram(cl_program     /* program */,
+-                         cl_uint        /* num_kernels */,
+-                         cl_kernel *    /* kernels */,
+-                         cl_uint *      /* num_kernels_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainKernel(cl_kernel    /* kernel */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseKernel(cl_kernel   /* kernel */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clSetKernelArg(cl_kernel    /* kernel */,
+-               cl_uint      /* arg_index */,
+-               size_t       /* arg_size */,
+-               const void * /* arg_value */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetKernelInfo(cl_kernel       /* kernel */,
+-                cl_kernel_info  /* param_name */,
+-                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
+-clGetKernelArgInfo(cl_kernel       /* kernel */,
+-                   cl_uint         /* arg_indx */,
+-                   cl_kernel_arg_info  /* param_name */,
+-                   size_t          /* param_value_size */,
+-                   void *          /* param_value */,
+-                   size_t *        /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_2;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetKernelWorkGroupInfo(cl_kernel                  /* kernel */,
+-                         cl_device_id               /* device */,
+-                         cl_kernel_work_group_info  /* param_name */,
+-                         size_t                     /* param_value_size */,
+-                         void *                     /* param_value */,
+-                         size_t *                   /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-/* Event Object APIs */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clWaitForEvents(cl_uint             /* num_events */,
+-                const cl_event *    /* event_list */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetEventInfo(cl_event         /* event */,
+-               cl_event_info    /* param_name */,
+-               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_event CL_API_CALL
+-clCreateUserEvent(cl_context    /* context */,
+-                  cl_int *      /* errcode_ret */) CL_API_SUFFIX__VERSION_1_1;               
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clRetainEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clReleaseEvent(cl_event /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clSetUserEventStatus(cl_event   /* event */,
+-                     cl_int     /* execution_status */) CL_API_SUFFIX__VERSION_1_1;
+-                     
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clSetEventCallback( cl_event    /* event */,
+-                    cl_int      /* command_exec_callback_type */,
+-                    void (CL_CALLBACK * /* pfn_notify */)(cl_event, cl_int, void *),
+-                    void *      /* user_data */) CL_API_SUFFIX__VERSION_1_1;
+-
+-/* Profiling APIs */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetEventProfilingInfo(cl_event            /* event */,
+-                        cl_profiling_info   /* param_name */,
+-                        size_t              /* param_value_size */,
+-                        void *              /* param_value */,
+-                        size_t *            /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-                                
+-/* Flush and Finish APIs */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clFlush(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clFinish(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+-
+-/* Enqueued Commands APIs */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueReadBuffer(cl_command_queue    /* command_queue */,
+-                    cl_mem              /* buffer */,
+-                    cl_bool             /* blocking_read */,
+-                    size_t              /* offset */,
+-                    size_t              /* size */, 
+-                    void *              /* ptr */,
+-                    cl_uint             /* num_events_in_wait_list */,
+-                    const cl_event *    /* event_wait_list */,
+-                    cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_0;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueReadBufferRect(cl_command_queue    /* command_queue */,
+-                        cl_mem              /* buffer */,
+-                        cl_bool             /* blocking_read */,
+-                        const size_t *      /* buffer_offset */,
+-                        const size_t *      /* host_offset */, 
+-                        const size_t *      /* region */,
+-                        size_t              /* buffer_row_pitch */,
+-                        size_t              /* buffer_slice_pitch */,
+-                        size_t              /* host_row_pitch */,
+-                        size_t              /* host_slice_pitch */,                        
+-                        void *              /* ptr */,
+-                        cl_uint             /* num_events_in_wait_list */,
+-                        const cl_event *    /* event_wait_list */,
+-                        cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_1;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueWriteBuffer(cl_command_queue   /* command_queue */, 
+-                     cl_mem             /* buffer */, 
+-                     cl_bool            /* blocking_write */, 
+-                     size_t             /* offset */, 
+-                     size_t             /* size */, 
+-                     const void *       /* ptr */, 
+-                     cl_uint            /* num_events_in_wait_list */, 
+-                     const cl_event *   /* event_wait_list */, 
+-                     cl_event *         /* event */) CL_API_SUFFIX__VERSION_1_0;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueWriteBufferRect(cl_command_queue    /* command_queue */,
+-                         cl_mem              /* buffer */,
+-                         cl_bool             /* blocking_write */,
+-                         const size_t *      /* buffer_offset */,
+-                         const size_t *      /* host_offset */, 
+-                         const size_t *      /* region */,
+-                         size_t              /* buffer_row_pitch */,
+-                         size_t              /* buffer_slice_pitch */,
+-                         size_t              /* host_row_pitch */,
+-                         size_t              /* host_slice_pitch */,                        
+-                         const void *        /* ptr */,
+-                         cl_uint             /* num_events_in_wait_list */,
+-                         const cl_event *    /* event_wait_list */,
+-                         cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_1;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueFillBuffer(cl_command_queue   /* command_queue */,
+-                    cl_mem             /* buffer */, 
+-                    const void *       /* pattern */, 
+-                    size_t             /* pattern_size */, 
+-                    size_t             /* offset */, 
+-                    size_t             /* size */, 
+-                    cl_uint            /* num_events_in_wait_list */, 
+-                    const cl_event *   /* event_wait_list */, 
+-                    cl_event *         /* event */) CL_API_SUFFIX__VERSION_1_2;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueCopyBuffer(cl_command_queue    /* command_queue */, 
+-                    cl_mem              /* src_buffer */,
+-                    cl_mem              /* dst_buffer */, 
+-                    size_t              /* src_offset */,
+-                    size_t              /* dst_offset */,
+-                    size_t              /* size */, 
+-                    cl_uint             /* num_events_in_wait_list */,
+-                    const cl_event *    /* event_wait_list */,
+-                    cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_0;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueCopyBufferRect(cl_command_queue    /* command_queue */, 
+-                        cl_mem              /* src_buffer */,
+-                        cl_mem              /* dst_buffer */, 
+-                        const size_t *      /* src_origin */,
+-                        const size_t *      /* dst_origin */,
+-                        const size_t *      /* region */, 
+-                        size_t              /* src_row_pitch */,
+-                        size_t              /* src_slice_pitch */,
+-                        size_t              /* dst_row_pitch */,
+-                        size_t              /* dst_slice_pitch */,
+-                        cl_uint             /* num_events_in_wait_list */,
+-                        const cl_event *    /* event_wait_list */,
+-                        cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_1;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueReadImage(cl_command_queue     /* command_queue */,
+-                   cl_mem               /* image */,
+-                   cl_bool              /* blocking_read */, 
+-                   const size_t *       /* origin[3] */,
+-                   const size_t *       /* region[3] */,
+-                   size_t               /* row_pitch */,
+-                   size_t               /* slice_pitch */, 
+-                   void *               /* ptr */,
+-                   cl_uint              /* num_events_in_wait_list */,
+-                   const cl_event *     /* event_wait_list */,
+-                   cl_event *           /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueWriteImage(cl_command_queue    /* command_queue */,
+-                    cl_mem              /* image */,
+-                    cl_bool             /* blocking_write */, 
+-                    const size_t *      /* origin[3] */,
+-                    const size_t *      /* region[3] */,
+-                    size_t              /* input_row_pitch */,
+-                    size_t              /* input_slice_pitch */, 
+-                    const void *        /* ptr */,
+-                    cl_uint             /* num_events_in_wait_list */,
+-                    const cl_event *    /* event_wait_list */,
+-                    cl_event *          /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueFillImage(cl_command_queue   /* command_queue */,
+-                   cl_mem             /* image */, 
+-                   const void *       /* fill_color */, 
+-                   const size_t *     /* origin[3] */, 
+-                   const size_t *     /* region[3] */, 
+-                   cl_uint            /* num_events_in_wait_list */, 
+-                   const cl_event *   /* event_wait_list */, 
+-                   cl_event *         /* event */) CL_API_SUFFIX__VERSION_1_2;
+-                            
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueCopyImage(cl_command_queue     /* command_queue */,
+-                   cl_mem               /* src_image */,
+-                   cl_mem               /* dst_image */, 
+-                   const size_t *       /* src_origin[3] */,
+-                   const size_t *       /* dst_origin[3] */,
+-                   const size_t *       /* region[3] */, 
+-                   cl_uint              /* num_events_in_wait_list */,
+-                   const cl_event *     /* event_wait_list */,
+-                   cl_event *           /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueCopyImageToBuffer(cl_command_queue /* command_queue */,
+-                           cl_mem           /* src_image */,
+-                           cl_mem           /* dst_buffer */, 
+-                           const size_t *   /* src_origin[3] */,
+-                           const size_t *   /* region[3] */, 
+-                           size_t           /* dst_offset */,
+-                           cl_uint          /* num_events_in_wait_list */,
+-                           const cl_event * /* event_wait_list */,
+-                           cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueCopyBufferToImage(cl_command_queue /* command_queue */,
+-                           cl_mem           /* src_buffer */,
+-                           cl_mem           /* dst_image */, 
+-                           size_t           /* src_offset */,
+-                           const size_t *   /* dst_origin[3] */,
+-                           const size_t *   /* region[3] */, 
+-                           cl_uint          /* num_events_in_wait_list */,
+-                           const cl_event * /* event_wait_list */,
+-                           cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY void * CL_API_CALL
+-clEnqueueMapBuffer(cl_command_queue /* command_queue */,
+-                   cl_mem           /* buffer */,
+-                   cl_bool          /* blocking_map */, 
+-                   cl_map_flags     /* map_flags */,
+-                   size_t           /* offset */,
+-                   size_t           /* size */,
+-                   cl_uint          /* num_events_in_wait_list */,
+-                   const cl_event * /* event_wait_list */,
+-                   cl_event *       /* event */,
+-                   cl_int *         /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY void * CL_API_CALL
+-clEnqueueMapImage(cl_command_queue  /* command_queue */,
+-                  cl_mem            /* image */, 
+-                  cl_bool           /* blocking_map */, 
+-                  cl_map_flags      /* map_flags */, 
+-                  const size_t *    /* origin[3] */,
+-                  const size_t *    /* region[3] */,
+-                  size_t *          /* image_row_pitch */,
+-                  size_t *          /* image_slice_pitch */,
+-                  cl_uint           /* num_events_in_wait_list */,
+-                  const cl_event *  /* event_wait_list */,
+-                  cl_event *        /* event */,
+-                  cl_int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueUnmapMemObject(cl_command_queue /* command_queue */,
+-                        cl_mem           /* memobj */,
+-                        void *           /* mapped_ptr */,
+-                        cl_uint          /* num_events_in_wait_list */,
+-                        const cl_event *  /* event_wait_list */,
+-                        cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueMigrateMemObjects(cl_command_queue       /* command_queue */,
+-                           cl_uint                /* num_mem_objects */,
+-                           const cl_mem *         /* mem_objects */,
+-                           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_1_2;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueNDRangeKernel(cl_command_queue /* command_queue */,
+-                       cl_kernel        /* kernel */,
+-                       cl_uint          /* work_dim */,
+-                       const size_t *   /* global_work_offset */,
+-                       const size_t *   /* global_work_size */,
+-                       const size_t *   /* local_work_size */,
+-                       cl_uint          /* num_events_in_wait_list */,
+-                       const cl_event * /* event_wait_list */,
+-                       cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY 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_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueNativeKernel(cl_command_queue  /* command_queue */,
+-					  void (CL_CALLBACK * /*user_func*/)(void *), 
+-                      void *            /* args */,
+-                      size_t            /* cb_args */, 
+-                      cl_uint           /* num_mem_objects */,
+-                      const cl_mem *    /* mem_list */,
+-                      const void **     /* args_mem_loc */,
+-                      cl_uint           /* num_events_in_wait_list */,
+-                      const cl_event *  /* event_wait_list */,
+-                      cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueMarkerWithWaitList(cl_command_queue /* command_queue */,
+-                            cl_uint           /* num_events_in_wait_list */,
+-                            const cl_event *  /* event_wait_list */,
+-                            cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_2;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueBarrierWithWaitList(cl_command_queue /* command_queue */,
+-                             cl_uint           /* num_events_in_wait_list */,
+-                             const cl_event *  /* event_wait_list */,
+-                             cl_event *        /* event */) CL_API_SUFFIX__VERSION_1_2;
+-
+-
+-/* Extension function access
+- *
+- * Returns the extension function address for the given function name,
+- * or NULL if a valid function can not be found.  The client must
+- * check to make sure the address is not NULL, before using or 
+- * calling the returned function address.
+- */
+-extern CL_API_ENTRY void * CL_API_CALL 
+-clGetExtensionFunctionAddressForPlatform(cl_platform_id /* platform */,
+-                                         const char *   /* func_name */) CL_API_SUFFIX__VERSION_1_2;
+-    
+-
+-// Deprecated OpenCL 1.1 APIs
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
+-clCreateImage2D(cl_context              /* context */,
+-                cl_mem_flags            /* flags */,
+-                const cl_image_format * /* image_format */,
+-                size_t                  /* image_width */,
+-                size_t                  /* image_height */,
+-                size_t                  /* image_row_pitch */, 
+-                void *                  /* host_ptr */,
+-                cl_int *                /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
+-clCreateImage3D(cl_context              /* context */,
+-                cl_mem_flags            /* flags */,
+-                const cl_image_format * /* image_format */,
+-                size_t                  /* image_width */, 
+-                size_t                  /* image_height */,
+-                size_t                  /* image_depth */, 
+-                size_t                  /* image_row_pitch */, 
+-                size_t                  /* image_slice_pitch */, 
+-                void *                  /* host_ptr */,
+-                cl_int *                /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+-clEnqueueMarker(cl_command_queue    /* command_queue */,
+-                cl_event *          /* event */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+-clEnqueueWaitForEvents(cl_command_queue /* command_queue */,
+-                        cl_uint          /* num_events */,
+-                        const cl_event * /* event_list */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+-clEnqueueBarrier(cl_command_queue /* command_queue */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_int CL_API_CALL
+-clUnloadCompiler(void) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-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;
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif  /* __OPENCL_CL_H */
+-
+--- a/src/CL/cl_d3d10.h
++++ /dev/null
+@@ -1,126 +0,0 @@
+-/**********************************************************************************
+- * Copyright (c) 2008-2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- **********************************************************************************/
+-
+-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
+-
+-#ifndef __OPENCL_CL_D3D10_H
+-#define __OPENCL_CL_D3D10_H
+-
+-#include <d3d10.h>
+-#include <CL/cl.h>
+-#include <CL/cl_platform.h>
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/******************************************************************************
+- * cl_khr_d3d10_sharing                                                       */
+-#define cl_khr_d3d10_sharing 1
+-
+-typedef cl_uint cl_d3d10_device_source_khr;
+-typedef cl_uint cl_d3d10_device_set_khr;
+-
+-/******************************************************************************/
+-
+-// Error Codes
+-#define CL_INVALID_D3D10_DEVICE_KHR                  -1002
+-#define CL_INVALID_D3D10_RESOURCE_KHR                -1003
+-#define CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR       -1004
+-#define CL_D3D10_RESOURCE_NOT_ACQUIRED_KHR           -1005
+-
+-// cl_d3d10_device_source_nv
+-#define CL_D3D10_DEVICE_KHR                          0x4010
+-#define CL_D3D10_DXGI_ADAPTER_KHR                    0x4011
+-
+-// cl_d3d10_device_set_nv
+-#define CL_PREFERRED_DEVICES_FOR_D3D10_KHR           0x4012
+-#define CL_ALL_DEVICES_FOR_D3D10_KHR                 0x4013
+-
+-// cl_context_info
+-#define CL_CONTEXT_D3D10_DEVICE_KHR                  0x4014
+-#define CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR 0x402C
+-
+-// cl_mem_info
+-#define CL_MEM_D3D10_RESOURCE_KHR                    0x4015
+-
+-// cl_image_info
+-#define CL_IMAGE_D3D10_SUBRESOURCE_KHR               0x4016
+-
+-// cl_command_type
+-#define CL_COMMAND_ACQUIRE_D3D10_OBJECTS_KHR         0x4017
+-#define CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR         0x4018
+-
+-/******************************************************************************/
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D10KHR_fn)(
+-    cl_platform_id             platform,
+-    cl_d3d10_device_source_khr d3d_device_source,
+-    void *                     d3d_object,
+-    cl_d3d10_device_set_khr    d3d_device_set,
+-    cl_uint                    num_entries,
+-    cl_device_id *             devices,
+-    cl_uint *                  num_devices) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10BufferKHR_fn)(
+-    cl_context     context,
+-    cl_mem_flags   flags,
+-    ID3D10Buffer * resource,
+-    cl_int *       errcode_ret) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture2DKHR_fn)(
+-    cl_context        context,
+-    cl_mem_flags      flags,
+-    ID3D10Texture2D * resource,
+-    UINT              subresource,
+-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D10Texture3DKHR_fn)(
+-    cl_context        context,
+-    cl_mem_flags      flags,
+-    ID3D10Texture3D * resource,
+-    UINT              subresource,
+-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D10ObjectsKHR_fn)(
+-    cl_command_queue command_queue,
+-    cl_uint          num_objects,
+-    const cl_mem *   mem_objects,
+-    cl_uint          num_events_in_wait_list,
+-    const cl_event * event_wait_list,
+-    cl_event *       event) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D10ObjectsKHR_fn)(
+-    cl_command_queue command_queue,
+-    cl_uint          num_objects,
+-    const cl_mem *   mem_objects,
+-    cl_uint          num_events_in_wait_list,
+-    const cl_event * event_wait_list,
+-    cl_event *       event) CL_API_SUFFIX__VERSION_1_0;
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif  // __OPENCL_CL_D3D10_H
+-
+--- a/src/CL/cl_d3d11.h
++++ /dev/null
+@@ -1,126 +0,0 @@
+-/**********************************************************************************
+- * Copyright (c) 2008-2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- **********************************************************************************/
+-
+-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
+-
+-#ifndef __OPENCL_CL_D3D11_H
+-#define __OPENCL_CL_D3D11_H
+-
+-#include <d3d11.h>
+-#include <CL/cl.h>
+-#include <CL/cl_platform.h>
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/******************************************************************************
+- * cl_khr_d3d11_sharing                                                       */
+-#define cl_khr_d3d11_sharing 1
+-
+-typedef cl_uint cl_d3d11_device_source_khr;
+-typedef cl_uint cl_d3d11_device_set_khr;
+-
+-/******************************************************************************/
+-
+-// Error Codes
+-#define CL_INVALID_D3D11_DEVICE_KHR                  -1006
+-#define CL_INVALID_D3D11_RESOURCE_KHR                -1007
+-#define CL_D3D11_RESOURCE_ALREADY_ACQUIRED_KHR       -1008
+-#define CL_D3D11_RESOURCE_NOT_ACQUIRED_KHR           -1009
+-
+-// cl_d3d11_device_source
+-#define CL_D3D11_DEVICE_KHR                          0x4019
+-#define CL_D3D11_DXGI_ADAPTER_KHR                    0x401A
+-
+-// cl_d3d11_device_set
+-#define CL_PREFERRED_DEVICES_FOR_D3D11_KHR           0x401B
+-#define CL_ALL_DEVICES_FOR_D3D11_KHR                 0x401C
+-
+-// cl_context_info
+-#define CL_CONTEXT_D3D11_DEVICE_KHR                  0x401D
+-#define CL_CONTEXT_D3D11_PREFER_SHARED_RESOURCES_KHR 0x402D
+-
+-// cl_mem_info
+-#define CL_MEM_D3D11_RESOURCE_KHR                    0x401E
+-
+-// cl_image_info
+-#define CL_IMAGE_D3D11_SUBRESOURCE_KHR               0x401F
+-
+-// cl_command_type
+-#define CL_COMMAND_ACQUIRE_D3D11_OBJECTS_KHR         0x4020
+-#define CL_COMMAND_RELEASE_D3D11_OBJECTS_KHR         0x4021
+-
+-/******************************************************************************/
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromD3D11KHR_fn)(
+-    cl_platform_id             platform,
+-    cl_d3d11_device_source_khr d3d_device_source,
+-    void *                     d3d_object,
+-    cl_d3d11_device_set_khr    d3d_device_set,
+-    cl_uint                    num_entries,
+-    cl_device_id *             devices,
+-    cl_uint *                  num_devices) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11BufferKHR_fn)(
+-    cl_context     context,
+-    cl_mem_flags   flags,
+-    ID3D11Buffer * resource,
+-    cl_int *       errcode_ret) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture2DKHR_fn)(
+-    cl_context        context,
+-    cl_mem_flags      flags,
+-    ID3D11Texture2D * resource,
+-    UINT              subresource,
+-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromD3D11Texture3DKHR_fn)(
+-    cl_context        context,
+-    cl_mem_flags      flags,
+-    ID3D11Texture3D * resource,
+-    UINT              subresource,
+-    cl_int *          errcode_ret) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireD3D11ObjectsKHR_fn)(
+-    cl_command_queue command_queue,
+-    cl_uint          num_objects,
+-    const cl_mem *   mem_objects,
+-    cl_uint          num_events_in_wait_list,
+-    const cl_event * event_wait_list,
+-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseD3D11ObjectsKHR_fn)(
+-    cl_command_queue command_queue,
+-    cl_uint          num_objects,
+-    const cl_mem *   mem_objects,
+-    cl_uint          num_events_in_wait_list,
+-    const cl_event * event_wait_list,
+-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif  // __OPENCL_CL_D3D11_H
+-
+--- a/src/CL/cl_dx9_media_sharing.h
++++ /dev/null
+@@ -1,127 +0,0 @@
+-/**********************************************************************************
+- * Copyright (c) 2008-2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- **********************************************************************************/
+-
+-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
+-
+-#ifndef __OPENCL_CL_DX9_MEDIA_SHARING_H
+-#define __OPENCL_CL_DX9_MEDIA_SHARING_H
+-
+-#include <CL/cl.h>
+-#include <CL/cl_platform.h>
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/******************************************************************************
+-/* cl_khr_dx9_media_sharing                                                   */
+-#define cl_khr_dx9_media_sharing 1
+-
+-typedef cl_uint             cl_dx9_media_adapter_type_khr;
+-typedef cl_uint             cl_dx9_media_adapter_set_khr;
+-    
+-#if defined(_WIN32)
+-#include <d3d9.h>
+-typedef struct _cl_dx9_surface_info_khr
+-{
+-    IDirect3DSurface9 *resource;
+-    HANDLE shared_handle;
+-} cl_dx9_surface_info_khr;
+-#endif
+-
+-
+-/******************************************************************************/
+-
+-// Error Codes
+-#define CL_INVALID_DX9_MEDIA_ADAPTER_KHR                -1010
+-#define CL_INVALID_DX9_MEDIA_SURFACE_KHR                -1011
+-#define CL_DX9_MEDIA_SURFACE_ALREADY_ACQUIRED_KHR       -1012
+-#define CL_DX9_MEDIA_SURFACE_NOT_ACQUIRED_KHR           -1013
+-
+-// cl_media_adapter_type_khr
+-#define CL_ADAPTER_D3D9_KHR                              0x2020
+-#define CL_ADAPTER_D3D9EX_KHR                            0x2021
+-#define CL_ADAPTER_DXVA_KHR                              0x2022
+-
+-// cl_media_adapter_set_khr
+-#define CL_PREFERRED_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR   0x2023
+-#define CL_ALL_DEVICES_FOR_DX9_MEDIA_ADAPTER_KHR         0x2024
+-
+-// cl_context_info
+-#define CL_CONTEXT_ADAPTER_D3D9_KHR                      0x2025
+-#define CL_CONTEXT_ADAPTER_D3D9EX_KHR                    0x2026
+-#define CL_CONTEXT_ADAPTER_DXVA_KHR                      0x2027
+-
+-// cl_mem_info
+-#define CL_MEM_DX9_MEDIA_ADAPTER_TYPE_KHR                0x2028
+-#define CL_MEM_DX9_MEDIA_SURFACE_INFO_KHR                0x2029
+-
+-// cl_image_info
+-#define CL_IMAGE_DX9_MEDIA_PLANE_KHR                     0x202A
+-
+-// cl_command_type
+-#define CL_COMMAND_ACQUIRE_DX9_MEDIA_SURFACES_KHR        0x202B
+-#define CL_COMMAND_RELEASE_DX9_MEDIA_SURFACES_KHR        0x202C
+-
+-/******************************************************************************/
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetDeviceIDsFromDX9MediaAdapterKHR_fn)(
+-    cl_platform_id                   platform,
+-    cl_uint                          num_media_adapters,
+-    cl_dx9_media_adapter_type_khr *  media_adapter_type,
+-    void *                           media_adapters,
+-    cl_dx9_media_adapter_set_khr     media_adapter_set,
+-    cl_uint                          num_entries,
+-    cl_device_id *                   devices,
+-    cl_uint *                        num_devices) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromDX9MediaSurfaceKHR_fn)(
+-    cl_context                    context,
+-    cl_mem_flags                  flags,
+-    cl_dx9_media_adapter_type_khr adapter_type,
+-    void *                        surface_info,
+-    cl_uint                       plane,                                                                          
+-    cl_int *                      errcode_ret) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireDX9MediaSurfacesKHR_fn)(
+-    cl_command_queue command_queue,
+-    cl_uint          num_objects,
+-    const cl_mem *   mem_objects,
+-    cl_uint          num_events_in_wait_list,
+-    const cl_event * event_wait_list,
+-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseDX9MediaSurfacesKHR_fn)(
+-    cl_command_queue command_queue,
+-    cl_uint          num_objects,
+-    const cl_mem *   mem_objects,
+-    cl_uint          num_events_in_wait_list,
+-    const cl_event * event_wait_list,
+-    cl_event *       event) CL_API_SUFFIX__VERSION_1_2;
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif  // __OPENCL_CL_DX9_MEDIA_SHARING_H
+-
+--- a/src/CL/cl_egl.h
++++ /dev/null
+@@ -1,131 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2008-2010 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- ******************************************************************************/
+-
+-#ifndef __OPENCL_CL_EGL_H
+-#define __OPENCL_CL_EGL_H
+-
+-#ifdef __APPLE__
+-
+-#else
+-#include <CL/cl.h>
+-#include <EGL/egl.h>
+-#include <EGL/eglext.h>
+-#endif  
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-
+-/* Command type for events created with clEnqueueAcquireEGLObjectsKHR */
+-#define CL_COMMAND_EGL_FENCE_SYNC_OBJECT_KHR  0x202F
+-#define CL_COMMAND_ACQUIRE_EGL_OBJECTS_KHR    0x202D
+-#define CL_COMMAND_RELEASE_EGL_OBJECTS_KHR    0x202E
+-
+-/* Error type for clCreateFromEGLImageKHR */
+-#define CL_INVALID_EGL_OBJECT_KHR             -1093
+-#define CL_EGL_RESOURCE_NOT_ACQUIRED_KHR      -1092
+-
+-/* CLeglImageKHR is an opaque handle to an EGLImage */
+-typedef void* CLeglImageKHR;
+-
+-/* CLeglDisplayKHR is an opaque handle to an EGLDisplay */
+-typedef void* CLeglDisplayKHR;
+-
+-/* properties passed to clCreateFromEGLImageKHR */
+-typedef intptr_t cl_egl_image_properties_khr;
+-
+-
+-#define cl_khr_egl_image 1
+-
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateFromEGLImageKHR(cl_context                  /* context */,
+-                        CLeglDisplayKHR             /* egldisplay */,
+-                        CLeglImageKHR               /* eglimage */,
+-                        cl_mem_flags                /* flags */,
+-                        const cl_egl_image_properties_khr * /* properties */,
+-                        cl_int *                    /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_mem (CL_API_CALL *clCreateFromEGLImageKHR_fn)(
+-	cl_context                  context,
+-	CLeglDisplayKHR             egldisplay,
+-	CLeglImageKHR               eglimage,
+-	cl_mem_flags                flags,
+-	const cl_egl_image_properties_khr * properties,
+-	cl_int *                    errcode_ret);
+-
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueAcquireEGLObjectsKHR(cl_command_queue /* command_queue */,
+-                              cl_uint          /* num_objects */,
+-                              const cl_mem *   /* mem_objects */,
+-                              cl_uint          /* num_events_in_wait_list */,
+-                              const cl_event * /* event_wait_list */,
+-                              cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueAcquireEGLObjectsKHR_fn)(
+-	cl_command_queue command_queue,
+-	cl_uint          num_objects,
+-	const cl_mem *   mem_objects,
+-	cl_uint          num_events_in_wait_list,
+-	const cl_event * event_wait_list,
+-	cl_event *       event);
+-
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueReleaseEGLObjectsKHR(cl_command_queue /* command_queue */,
+-                              cl_uint          /* num_objects */,
+-                              const cl_mem *   /* mem_objects */,
+-                              cl_uint          /* num_events_in_wait_list */,
+-                              const cl_event * /* event_wait_list */,
+-                              cl_event *       /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clEnqueueReleaseEGLObjectsKHR_fn)(
+-	cl_command_queue command_queue,
+-	cl_uint          num_objects,
+-	const cl_mem *   mem_objects,
+-	cl_uint          num_events_in_wait_list,
+-	const cl_event * event_wait_list,
+-	cl_event *       event);
+-
+-
+-#define cl_khr_egl_event 1
+-
+-extern CL_API_ENTRY cl_event CL_API_CALL
+-clCreateEventFromEGLSyncKHR(cl_context /* context */,
+-                            EGLSyncKHR /* sync */,
+-                            EGLDisplay /* display */,
+-                            cl_int *   /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-typedef CL_API_ENTRY cl_event (CL_API_CALL *clCreateEventFromEGLSyncKHR_fn)(
+-	cl_context context,
+-	EGLSyncKHR sync,
+-	EGLDisplay display,
+-	cl_int *   errcode_ret);
+-
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* __OPENCL_CL_EGL_H */
+--- a/src/CL/cl_ext.h
++++ /dev/null
+@@ -1,310 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2008-2013 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- ******************************************************************************/
+-
+-/* $Revision: 11928 $ on $Date: 2010-07-13 09:04:56 -0700 (Tue, 13 Jul 2010) $ */
+-
+-/* cl_ext.h contains OpenCL extensions which don't have external */
+-/* (OpenGL, D3D) dependencies.                                   */
+-
+-#ifndef __CL_EXT_H
+-#define __CL_EXT_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#ifdef __APPLE__
+-        #include <OpenCL/cl.h>
+-    #include <AvailabilityMacros.h>
+-#else
+-        #include <CL/cl.h>
+-#endif
+-
+-/* cl_khr_fp16 extension - no extension #define since it has no functions  */
+-#define CL_DEVICE_HALF_FP_CONFIG                    0x1033
+-
+-/* Memory object destruction
+- *
+- * Apple extension for use to manage externally allocated buffers used with cl_mem objects with CL_MEM_USE_HOST_PTR
+- *
+- * Registers a user callback function that will be called when the memory object is deleted and its resources 
+- * freed. Each call to clSetMemObjectCallbackFn registers the specified user callback function on a callback 
+- * stack associated with memobj. The registered user callback functions are called in the reverse order in 
+- * which they were registered. The user callback functions are called and then the memory object is deleted 
+- * and its resources freed. This provides a mechanism for the application (and libraries) using memobj to be 
+- * notified when the memory referenced by host_ptr, specified when the memory object is created and used as 
+- * the storage bits for the memory object, can be reused or freed.
+- *
+- * The application may not call CL api's with the cl_mem object passed to the pfn_notify.
+- *
+- * Please check for the "cl_APPLE_SetMemObjectDestructor" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS)
+- * before using.
+- */
+-#define cl_APPLE_SetMemObjectDestructor 1
+-cl_int  CL_API_ENTRY clSetMemObjectDestructorAPPLE(  cl_mem /* memobj */, 
+-                                        void (* /*pfn_notify*/)( cl_mem /* memobj */, void* /*user_data*/), 
+-                                        void * /*user_data */ )             CL_EXT_SUFFIX__VERSION_1_0;  
+-
+-
+-/* Context Logging Functions
+- *
+- * The next three convenience functions are intended to be used as the pfn_notify parameter to clCreateContext().
+- * Please check for the "cl_APPLE_ContextLoggingFunctions" extension using clGetDeviceInfo(CL_DEVICE_EXTENSIONS)
+- * before using.
+- *
+- * clLogMessagesToSystemLog fowards on all log messages to the Apple System Logger 
+- */
+-#define cl_APPLE_ContextLoggingFunctions 1
+-extern void CL_API_ENTRY clLogMessagesToSystemLogAPPLE(  const char * /* errstr */, 
+-                                            const void * /* private_info */, 
+-                                            size_t       /* cb */, 
+-                                            void *       /* user_data */ )  CL_EXT_SUFFIX__VERSION_1_0;
+-
+-/* clLogMessagesToStdout sends all log messages to the file descriptor stdout */
+-extern void CL_API_ENTRY clLogMessagesToStdoutAPPLE(   const char * /* errstr */, 
+-                                          const void * /* private_info */, 
+-                                          size_t       /* cb */, 
+-                                          void *       /* user_data */ )    CL_EXT_SUFFIX__VERSION_1_0;
+-
+-/* clLogMessagesToStderr sends all log messages to the file descriptor stderr */
+-extern void CL_API_ENTRY clLogMessagesToStderrAPPLE(   const char * /* errstr */, 
+-                                          const void * /* private_info */, 
+-                                          size_t       /* cb */, 
+-                                          void *       /* user_data */ )    CL_EXT_SUFFIX__VERSION_1_0;
+-
+-
+-/************************ 
+-* cl_khr_icd extension *                                                  
+-************************/
+-#define cl_khr_icd 1
+-
+-/* cl_platform_info                                                        */
+-#define CL_PLATFORM_ICD_SUFFIX_KHR                  0x0920
+-
+-/* Additional Error Codes                                                  */
+-#define CL_PLATFORM_NOT_FOUND_KHR                   -1001
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clIcdGetPlatformIDsKHR(cl_uint          /* num_entries */,
+-                       cl_platform_id * /* platforms */,
+-                       cl_uint *        /* num_platforms */);
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clIcdGetPlatformIDsKHR_fn)(
+-    cl_uint          /* num_entries */,
+-    cl_platform_id * /* platforms */,
+-    cl_uint *        /* num_platforms */);
+-
+-
+-/* Extension: cl_khr_image2D_buffer
+- *
+- * This extension allows a 2D image to be created from a cl_mem buffer without a copy.
+- * The type associated with a 2D image created from a buffer in an OpenCL program is image2d_t.
+- * Both the sampler and sampler-less read_image built-in functions are supported for 2D images
+- * and 2D images created from a buffer.  Similarly, the write_image built-ins are also supported
+- * for 2D images created from a buffer.
+- *
+- * When the 2D image from buffer is created, the client must specify the width,
+- * height, image format (i.e. channel order and channel data type) and optionally the row pitch
+- *
+- * The pitch specified must be a multiple of CL_DEVICE_IMAGE_PITCH_ALIGNMENT pixels.
+- * The base address of the buffer must be aligned to CL_DEVICE_IMAGE_BASE_ADDRESS_ALIGNMENT pixels.
+- */
+-    
+-/*************************************
+- * cl_khr_initalize_memory extension *
+- *************************************/
+-    
+-#define CL_CONTEXT_MEMORY_INITIALIZE_KHR            0x200E
+-    
+-    
+-/**************************************
+- * cl_khr_terminate_context extension *
+- **************************************/
+-    
+-#define CL_DEVICE_TERMINATE_CAPABILITY_KHR          0x200F
+-#define CL_CONTEXT_TERMINATE_KHR                    0x2010
+-
+-#define cl_khr_terminate_context 1
+-extern CL_API_ENTRY cl_int CL_API_CALL clTerminateContextKHR(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2;
+-
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context /* context */) CL_EXT_SUFFIX__VERSION_1_2;
+-    
+-    
+-/*
+- * Extension: cl_khr_spir
+- *
+- * This extension adds support to create an OpenCL program object from a 
+- * Standard Portable Intermediate Representation (SPIR) instance
+- */
+-
+-#define CL_DEVICE_SPIR_VERSIONS                     0x40E0
+-#define CL_PROGRAM_BINARY_TYPE_INTERMEDIATE         0x40E1
+-
+-
+-/******************************************
+-* cl_nv_device_attribute_query extension *
+-******************************************/
+-/* cl_nv_device_attribute_query extension - no extension #define since it has no functions */
+-#define CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV       0x4000
+-#define CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV       0x4001
+-#define CL_DEVICE_REGISTERS_PER_BLOCK_NV            0x4002
+-#define CL_DEVICE_WARP_SIZE_NV                      0x4003
+-#define CL_DEVICE_GPU_OVERLAP_NV                    0x4004
+-#define CL_DEVICE_KERNEL_EXEC_TIMEOUT_NV            0x4005
+-#define CL_DEVICE_INTEGRATED_MEMORY_NV              0x4006
+-
+-/*********************************
+-* cl_amd_device_attribute_query *
+-*********************************/
+-#define CL_DEVICE_PROFILING_TIMER_OFFSET_AMD        0x4036
+-
+-#ifdef CL_VERSION_1_1
+-   /***********************************
+-    * cl_ext_device_fission extension *
+-    ***********************************/
+-    #define cl_ext_device_fission   1
+-    
+-    extern CL_API_ENTRY cl_int CL_API_CALL
+-    clReleaseDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; 
+-    
+-    typedef CL_API_ENTRY cl_int 
+-    (CL_API_CALL *clReleaseDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
+-
+-    extern CL_API_ENTRY cl_int CL_API_CALL
+-    clRetainDeviceEXT( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1; 
+-    
+-    typedef CL_API_ENTRY cl_int 
+-    (CL_API_CALL *clRetainDeviceEXT_fn)( cl_device_id /*device*/ ) CL_EXT_SUFFIX__VERSION_1_1;
+-
+-    typedef cl_ulong  cl_device_partition_property_ext;
+-    extern CL_API_ENTRY cl_int CL_API_CALL
+-    clCreateSubDevicesEXT(  cl_device_id /*in_device*/,
+-                            const cl_device_partition_property_ext * /* properties */,
+-                            cl_uint /*num_entries*/,
+-                            cl_device_id * /*out_devices*/,
+-                            cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
+-
+-    typedef CL_API_ENTRY cl_int 
+-    ( CL_API_CALL * clCreateSubDevicesEXT_fn)(  cl_device_id /*in_device*/,
+-                                                const cl_device_partition_property_ext * /* properties */,
+-                                                cl_uint /*num_entries*/,
+-                                                cl_device_id * /*out_devices*/,
+-                                                cl_uint * /*num_devices*/ ) CL_EXT_SUFFIX__VERSION_1_1;
+-
+-    /* cl_device_partition_property_ext */
+-    #define CL_DEVICE_PARTITION_EQUALLY_EXT             0x4050
+-    #define CL_DEVICE_PARTITION_BY_COUNTS_EXT           0x4051
+-    #define CL_DEVICE_PARTITION_BY_NAMES_EXT            0x4052
+-    #define CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN_EXT  0x4053
+-    
+-    /* clDeviceGetInfo selectors */
+-    #define CL_DEVICE_PARENT_DEVICE_EXT                 0x4054
+-    #define CL_DEVICE_PARTITION_TYPES_EXT               0x4055
+-    #define CL_DEVICE_AFFINITY_DOMAINS_EXT              0x4056
+-    #define CL_DEVICE_REFERENCE_COUNT_EXT               0x4057
+-    #define CL_DEVICE_PARTITION_STYLE_EXT               0x4058
+-    
+-    /* error codes */
+-    #define CL_DEVICE_PARTITION_FAILED_EXT              -1057
+-    #define CL_INVALID_PARTITION_COUNT_EXT              -1058
+-    #define CL_INVALID_PARTITION_NAME_EXT               -1059
+-    
+-    /* CL_AFFINITY_DOMAINs */
+-    #define CL_AFFINITY_DOMAIN_L1_CACHE_EXT             0x1
+-    #define CL_AFFINITY_DOMAIN_L2_CACHE_EXT             0x2
+-    #define CL_AFFINITY_DOMAIN_L3_CACHE_EXT             0x3
+-    #define CL_AFFINITY_DOMAIN_L4_CACHE_EXT             0x4
+-    #define CL_AFFINITY_DOMAIN_NUMA_EXT                 0x10
+-    #define CL_AFFINITY_DOMAIN_NEXT_FISSIONABLE_EXT     0x100
+-    
+-    /* cl_device_partition_property_ext list terminators */
+-    #define CL_PROPERTIES_LIST_END_EXT                  ((cl_device_partition_property_ext) 0)
+-    #define CL_PARTITION_BY_COUNTS_LIST_END_EXT         ((cl_device_partition_property_ext) 0)
+-    #define CL_PARTITION_BY_NAMES_LIST_END_EXT          ((cl_device_partition_property_ext) 0 - 1)
+-
+-/*********************************
+-* cl_qcom_ext_host_ptr extension
+-*********************************/
+-
+-#define CL_MEM_EXT_HOST_PTR_QCOM                  (1 << 29)
+-
+-#define CL_DEVICE_EXT_MEM_PADDING_IN_BYTES_QCOM   0x40A0      
+-#define CL_DEVICE_PAGE_SIZE_QCOM                  0x40A1
+-#define CL_IMAGE_ROW_ALIGNMENT_QCOM               0x40A2
+-#define CL_IMAGE_SLICE_ALIGNMENT_QCOM             0x40A3
+-#define CL_MEM_HOST_UNCACHED_QCOM                 0x40A4
+-#define CL_MEM_HOST_WRITEBACK_QCOM                0x40A5
+-#define CL_MEM_HOST_WRITETHROUGH_QCOM             0x40A6
+-#define CL_MEM_HOST_WRITE_COMBINING_QCOM          0x40A7
+-
+-typedef cl_uint                                   cl_image_pitch_info_qcom;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetDeviceImageInfoQCOM(cl_device_id             device,
+-                         size_t                   image_width,
+-                         size_t                   image_height,
+-                         const cl_image_format   *image_format,
+-                         cl_image_pitch_info_qcom param_name,
+-                         size_t                   param_value_size,
+-                         void                    *param_value,
+-                         size_t                  *param_value_size_ret);
+-
+-typedef struct _cl_mem_ext_host_ptr
+-{
+-    // Type of external memory allocation.
+-    // Legal values will be defined in layered extensions.
+-    cl_uint  allocation_type;
+-            
+-    // Host cache policy for this external memory allocation.
+-    cl_uint  host_cache_policy;
+-
+-} cl_mem_ext_host_ptr;
+-
+-/*********************************
+-* cl_qcom_ion_host_ptr extension
+-*********************************/
+-
+-#define CL_MEM_ION_HOST_PTR_QCOM                  0x40A8
+-
+-typedef struct _cl_mem_ion_host_ptr
+-{
+-    // Type of external memory allocation.
+-    // Must be CL_MEM_ION_HOST_PTR_QCOM for ION allocations.
+-    cl_mem_ext_host_ptr  ext_host_ptr;
+-
+-    // ION file descriptor
+-    int                  ion_filedesc;
+-            
+-    // Host pointer to the ION allocated memory
+-    void*                ion_hostptr;
+-
+-} cl_mem_ion_host_ptr;
+-
+-#endif /* CL_VERSION_1_1 */
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-
+-#endif /* __CL_EXT_H */
+--- a/src/CL/cl_gl.h
++++ /dev/null
+@@ -1,162 +0,0 @@
+-/**********************************************************************************
+- * Copyright (c) 2008 - 2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- **********************************************************************************/
+-
+-#ifndef __OPENCL_CL_GL_H
+-#define __OPENCL_CL_GL_H
+-
+-#ifdef __APPLE__
+-#include <OpenCL/cl.h>
+-#else
+-#include <CL/cl.h>
+-#endif	
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-typedef cl_uint     cl_gl_object_type;
+-typedef cl_uint     cl_gl_texture_info;
+-typedef cl_uint     cl_gl_platform_info;
+-typedef struct __GLsync *cl_GLsync;
+-
+-/* cl_gl_object_type = 0x2000 - 0x200F enum values are currently taken           */
+-#define CL_GL_OBJECT_BUFFER                     0x2000
+-#define CL_GL_OBJECT_TEXTURE2D                  0x2001
+-#define CL_GL_OBJECT_TEXTURE3D                  0x2002
+-#define CL_GL_OBJECT_RENDERBUFFER               0x2003
+-#define CL_GL_OBJECT_TEXTURE2D_ARRAY            0x200E
+-#define CL_GL_OBJECT_TEXTURE1D                  0x200F
+-#define CL_GL_OBJECT_TEXTURE1D_ARRAY            0x2010
+-#define CL_GL_OBJECT_TEXTURE_BUFFER             0x2011
+-
+-/* cl_gl_texture_info           */
+-#define CL_GL_TEXTURE_TARGET                    0x2004
+-#define CL_GL_MIPMAP_LEVEL                      0x2005
+-#define CL_GL_NUM_SAMPLES                       0x2012
+-
+-
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateFromGLBuffer(cl_context     /* context */,
+-                     cl_mem_flags   /* flags */,
+-                     cl_GLuint      /* bufobj */,
+-                     int *          /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateFromGLTexture(cl_context      /* context */,
+-                      cl_mem_flags    /* flags */,
+-                      cl_GLenum       /* target */,
+-                      cl_GLint        /* miplevel */,
+-                      cl_GLuint       /* texture */,
+-                      cl_int *        /* errcode_ret */) CL_API_SUFFIX__VERSION_1_2;
+-    
+-extern CL_API_ENTRY cl_mem CL_API_CALL
+-clCreateFromGLRenderbuffer(cl_context   /* context */,
+-                           cl_mem_flags /* flags */,
+-                           cl_GLuint    /* renderbuffer */,
+-                           cl_int *     /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetGLObjectInfo(cl_mem                /* memobj */,
+-                  cl_gl_object_type *   /* gl_object_type */,
+-                  cl_GLuint *           /* gl_object_name */) CL_API_SUFFIX__VERSION_1_0;
+-                  
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetGLTextureInfo(cl_mem               /* memobj */,
+-                   cl_gl_texture_info   /* param_name */,
+-                   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
+-clEnqueueAcquireGLObjects(cl_command_queue      /* command_queue */,
+-                          cl_uint               /* num_objects */,
+-                          const cl_mem *        /* mem_objects */,
+-                          cl_uint               /* num_events_in_wait_list */,
+-                          const cl_event *      /* event_wait_list */,
+-                          cl_event *            /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueReleaseGLObjects(cl_command_queue      /* command_queue */,
+-                          cl_uint               /* num_objects */,
+-                          const cl_mem *        /* mem_objects */,
+-                          cl_uint               /* num_events_in_wait_list */,
+-                          const cl_event *      /* event_wait_list */,
+-                          cl_event *            /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-
+-// Deprecated OpenCL 1.1 APIs
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
+-clCreateFromGLTexture2D(cl_context      /* context */,
+-                        cl_mem_flags    /* flags */,
+-                        cl_GLenum       /* target */,
+-                        cl_GLint        /* miplevel */,
+-                        cl_GLuint       /* texture */,
+-                        cl_int *        /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-extern CL_API_ENTRY CL_EXT_PREFIX__VERSION_1_1_DEPRECATED cl_mem CL_API_CALL
+-clCreateFromGLTexture3D(cl_context      /* context */,
+-                        cl_mem_flags    /* flags */,
+-                        cl_GLenum       /* target */,
+-                        cl_GLint        /* miplevel */,
+-                        cl_GLuint       /* texture */,
+-                        cl_int *        /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED;
+-    
+-/* cl_khr_gl_sharing extension  */
+-    
+-#define cl_khr_gl_sharing 1
+-    
+-typedef cl_uint     cl_gl_context_info;
+-    
+-/* Additional Error Codes  */
+-#define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR  -1000
+-    
+-/* cl_gl_context_info  */
+-#define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR    0x2006
+-#define CL_DEVICES_FOR_GL_CONTEXT_KHR           0x2007
+-    
+-/* Additional cl_context_properties  */
+-#define CL_GL_CONTEXT_KHR                       0x2008
+-#define CL_EGL_DISPLAY_KHR                      0x2009
+-#define CL_GLX_DISPLAY_KHR                      0x200A
+-#define CL_WGL_HDC_KHR                          0x200B
+-#define CL_CGL_SHAREGROUP_KHR                   0x200C
+-    
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clGetGLContextInfoKHR(const cl_context_properties * /* properties */,
+-                      cl_gl_context_info            /* param_name */,
+-                      size_t                        /* param_value_size */,
+-                      void *                        /* param_value */,
+-                      size_t *                      /* param_value_size_ret */) CL_API_SUFFIX__VERSION_1_0;
+-    
+-typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetGLContextInfoKHR_fn)(
+-    const cl_context_properties * properties,
+-    cl_gl_context_info            param_name,
+-    size_t                        param_value_size,
+-    void *                        param_value,
+-    size_t *                      param_value_size_ret);
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif  /* __OPENCL_CL_GL_H */
+--- a/src/CL/cl_gl_ext.h
++++ /dev/null
+@@ -1,69 +0,0 @@
+-/**********************************************************************************
+- * Copyright (c) 2008-2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- **********************************************************************************/
+-
+-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
+-
+-/* cl_gl_ext.h contains vendor (non-KHR) OpenCL extensions which have           */
+-/* OpenGL dependencies.                                                         */
+-
+-#ifndef __OPENCL_CL_GL_EXT_H
+-#define __OPENCL_CL_GL_EXT_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#ifdef __APPLE__
+-    #include <OpenCL/cl_gl.h>
+-#else
+-    #include <CL/cl_gl.h>
+-#endif
+-
+-/*
+- * For each extension, follow this template
+- *  cl_VEN_extname extension  */
+-/* #define cl_VEN_extname 1
+- * ... define new types, if any
+- * ... define new tokens, if any
+- * ... define new APIs, if any
+- *
+- *  If you need GLtypes here, mirror them with a cl_GLtype, rather than including a GL header
+- *  This allows us to avoid having to decide whether to include GL headers or GLES here.
+- */
+-
+-/* 
+- *  cl_khr_gl_event  extension
+- *  See section 9.9 in the OpenCL 1.1 spec for more information
+- */
+-#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR     0x200D
+-
+-extern CL_API_ENTRY cl_event CL_API_CALL
+-clCreateEventFromGLsyncKHR(cl_context           /* context */,
+-                           cl_GLsync            /* cl_GLsync */,
+-                           cl_int *             /* errcode_ret */) CL_EXT_SUFFIX__VERSION_1_1;
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif	/* __OPENCL_CL_GL_EXT_H  */
+--- a/src/CL/opencl.h
++++ /dev/null
+@@ -1,54 +0,0 @@
+-/*******************************************************************************
+- * Copyright (c) 2008-2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- ******************************************************************************/
+-
+-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
+-
+-#ifndef __OPENCL_H
+-#define __OPENCL_H
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#ifdef __APPLE__
+-
+-#include <OpenCL/cl.h>
+-#include <OpenCL/cl_gl.h>
+-#include <OpenCL/cl_gl_ext.h>
+-#include <OpenCL/cl_ext.h>
+-
+-#else
+-
+-#include <CL/cl.h>
+-#include <CL/cl_gl.h>
+-#include <CL/cl_gl_ext.h>
+-#include <CL/cl_ext.h>
+-
+-#endif
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif  /* __OPENCL_H   */
+-
+--- a/src/core/WorkItemBuiltins.cpp
++++ b/src/core/WorkItemBuiltins.cpp
+@@ -18,7 +18,7 @@
+ #include "llvm/IR/DebugInfoMetadata.h"
+ #endif
+ 
+-#include "CL/cl.h"
++#include <CL/cl.h>
+ #include "Context.h"
+ #include "half.h"
+ #include "KernelInvocation.h"
+--- a/src/core/common.h
++++ b/src/core/common.h
+@@ -10,7 +10,7 @@
+ #define __common_h_
+ 
+ #include "config.h"
+-#include "CL/cl.h"
++#include <CL/cl.h>
+ #include <cassert>
+ #include <cstdio>
+ #include <cstdlib>
+--- a/src/runtime/icd.h
++++ b/src/runtime/icd.h
+@@ -120,15 +120,16 @@
+ 
+ #define CL_USE_DEPRECATED_OPENCL_1_0_APIS
+ #define CL_USE_DEPRECATED_OPENCL_1_1_APIS
++#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
+ 
+-#include "CL/cl.h"
+-#include "CL/cl_ext.h"
+-#include "CL/cl_gl.h"
+-#include "CL/cl_gl_ext.h"
++#include <CL/cl.h>
++#include <CL/cl_ext.h>
++#include <CL/cl_gl.h>
++#include <CL/cl_gl_ext.h>
+ #if defined(_WIN32) && !defined(__MINGW32__)
+-#include "CL/cl_d3d11.h"
+-#include "CL/cl_d3d10.h"
+-#include "CL/cl_dx9_media_sharing.h"
++#include <CL/cl_d3d11.h>
++#include <CL/cl_d3d10.h>
++#include <CL/cl_dx9_media_sharing.h>
+ #endif
+ 
+ namespace oclgrind
+--- a/src/CL/cl_platform.h
++++ /dev/null
+@@ -1,1278 +0,0 @@
+-/**********************************************************************************
+- * Copyright (c) 2008-2012 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
+- * "Materials"), to deal in the Materials without restriction, including
+- * without limitation the rights to use, copy, modify, merge, publish,
+- * distribute, sublicense, and/or sell copies of the Materials, and to
+- * permit persons to whom the Materials are furnished to do so, subject to
+- * the following conditions:
+- *
+- * The above copyright notice and this permission notice shall be included
+- * in all copies or substantial portions of the Materials.
+- *
+- * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+- * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+- **********************************************************************************/
+-
+-/* $Revision: 11803 $ on $Date: 2010-06-25 10:02:12 -0700 (Fri, 25 Jun 2010) $ */
+-
+-#ifndef __CL_PLATFORM_H
+-#define __CL_PLATFORM_H
+-
+-#ifdef __APPLE__
+-    /* Contains #defines for AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER below */
+-    #include <AvailabilityMacros.h>
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#if defined(_WIN32)
+-    #define CL_API_ENTRY
+-    #define CL_API_CALL     __stdcall
+-    #define CL_CALLBACK     __stdcall
+-#else
+-    #define CL_API_ENTRY
+-    #define CL_API_CALL
+-    #define CL_CALLBACK
+-#endif
+-
+-#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
+-    #define CL_EXT_SUFFIX__VERSION_1_0                  CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+-    #define CL_API_SUFFIX__VERSION_1_1                  AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-    #define GCL_API_SUFFIX__VERSION_1_1                 AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-    #define CL_EXT_SUFFIX__VERSION_1_1                  CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-    #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED       CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7
+-    
+-    #ifdef AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+-        #define CL_API_SUFFIX__VERSION_1_2              AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+-        #define GCL_API_SUFFIX__VERSION_1_2             AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+-        #define CL_EXT_SUFFIX__VERSION_1_2              CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_8_AND_LATER
+-        #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+-        #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_8
+-    #else
+-        #warning  This path should never happen outside of internal operating system development.  AvailabilityMacros do not function correctly here!
+-        #define CL_API_SUFFIX__VERSION_1_2              AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-        #define GCL_API_SUFFIX__VERSION_1_2             AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-        #define CL_EXT_SUFFIX__VERSION_1_2              CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-        #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED   CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+-    #endif
+-#else
+-    #define CL_EXTENSION_WEAK_LINK  
+-    #define CL_API_SUFFIX__VERSION_1_0
+-    #define CL_EXT_SUFFIX__VERSION_1_0
+-    #define CL_API_SUFFIX__VERSION_1_1
+-    #define CL_EXT_SUFFIX__VERSION_1_1
+-    #define CL_API_SUFFIX__VERSION_1_2
+-    #define CL_EXT_SUFFIX__VERSION_1_2
+-    
+-    #ifdef __GNUC__
+-        #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED    
+-        #else
+-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED __attribute__((deprecated))
+-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED    
+-        #endif
+-    
+-        #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
+-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED    
+-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED    
+-        #else
+-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED __attribute__((deprecated))
+-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED    
+-        #endif
+-    #elif _WIN32
+-        #ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED    
+-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED    
+-        #else
+-            #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED 
+-            #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED __declspec(deprecated)     
+-        #endif
+-    
+-        #ifdef CL_USE_DEPRECATED_OPENCL_1_1_APIS
+-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
+-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED    
+-        #else
+-            #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED 
+-            #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED __declspec(deprecated)     
+-        #endif
+-    #else
+-        #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+-        #define CL_EXT_PREFIX__VERSION_1_0_DEPRECATED
+-    
+-        #define CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED
+-        #define CL_EXT_PREFIX__VERSION_1_1_DEPRECATED
+-    #endif
+-#endif
+-
+-#if (defined (_WIN32) && defined(_MSC_VER))
+-
+-/* scalar types  */
+-typedef signed   __int8         cl_char;
+-typedef unsigned __int8         cl_uchar;
+-typedef signed   __int16        cl_short;
+-typedef unsigned __int16        cl_ushort;
+-typedef signed   __int32        cl_int;
+-typedef unsigned __int32        cl_uint;
+-typedef signed   __int64        cl_long;
+-typedef unsigned __int64        cl_ulong;
+-
+-typedef unsigned __int16        cl_half;
+-typedef float                   cl_float;
+-typedef double                  cl_double;
+-
+-/* Macro names and corresponding values defined by OpenCL */
+-#define CL_CHAR_BIT         8
+-#define CL_SCHAR_MAX        127
+-#define CL_SCHAR_MIN        (-127-1)
+-#define CL_CHAR_MAX         CL_SCHAR_MAX
+-#define CL_CHAR_MIN         CL_SCHAR_MIN
+-#define CL_UCHAR_MAX        255
+-#define CL_SHRT_MAX         32767
+-#define CL_SHRT_MIN         (-32767-1)
+-#define CL_USHRT_MAX        65535
+-#define CL_INT_MAX          2147483647
+-#define CL_INT_MIN          (-2147483647-1)
+-#define CL_UINT_MAX         0xffffffffU
+-#define CL_LONG_MAX         ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+-#define CL_LONG_MIN         ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+-#define CL_ULONG_MAX        ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+-
+-#define CL_FLT_DIG          6
+-#define CL_FLT_MANT_DIG     24
+-#define CL_FLT_MAX_10_EXP   +38
+-#define CL_FLT_MAX_EXP      +128
+-#define CL_FLT_MIN_10_EXP   -37
+-#define CL_FLT_MIN_EXP      -125
+-#define CL_FLT_RADIX        2
+-#define CL_FLT_MAX          340282346638528859811704183484516925440.0f
+-#define CL_FLT_MIN          1.175494350822287507969e-38f
+-#define CL_FLT_EPSILON      0x1.0p-23f
+-
+-#define CL_DBL_DIG          15
+-#define CL_DBL_MANT_DIG     53
+-#define CL_DBL_MAX_10_EXP   +308
+-#define CL_DBL_MAX_EXP      +1024
+-#define CL_DBL_MIN_10_EXP   -307
+-#define CL_DBL_MIN_EXP      -1021
+-#define CL_DBL_RADIX        2
+-#define CL_DBL_MAX          179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
+-#define CL_DBL_MIN          2.225073858507201383090e-308
+-#define CL_DBL_EPSILON      2.220446049250313080847e-16
+-
+-#define  CL_M_E             2.718281828459045090796
+-#define  CL_M_LOG2E         1.442695040888963387005
+-#define  CL_M_LOG10E        0.434294481903251816668
+-#define  CL_M_LN2           0.693147180559945286227
+-#define  CL_M_LN10          2.302585092994045901094
+-#define  CL_M_PI            3.141592653589793115998
+-#define  CL_M_PI_2          1.570796326794896557999
+-#define  CL_M_PI_4          0.785398163397448278999
+-#define  CL_M_1_PI          0.318309886183790691216
+-#define  CL_M_2_PI          0.636619772367581382433
+-#define  CL_M_2_SQRTPI      1.128379167095512558561
+-#define  CL_M_SQRT2         1.414213562373095145475
+-#define  CL_M_SQRT1_2       0.707106781186547572737
+-
+-#define  CL_M_E_F           2.71828174591064f
+-#define  CL_M_LOG2E_F       1.44269502162933f
+-#define  CL_M_LOG10E_F      0.43429449200630f
+-#define  CL_M_LN2_F         0.69314718246460f
+-#define  CL_M_LN10_F        2.30258512496948f
+-#define  CL_M_PI_F          3.14159274101257f
+-#define  CL_M_PI_2_F        1.57079637050629f
+-#define  CL_M_PI_4_F        0.78539818525314f
+-#define  CL_M_1_PI_F        0.31830987334251f
+-#define  CL_M_2_PI_F        0.63661974668503f
+-#define  CL_M_2_SQRTPI_F    1.12837922573090f
+-#define  CL_M_SQRT2_F       1.41421353816986f
+-#define  CL_M_SQRT1_2_F     0.70710676908493f
+-
+-#define CL_NAN              (CL_INFINITY - CL_INFINITY)
+-#define CL_HUGE_VALF        ((cl_float) 1e50)
+-#define CL_HUGE_VAL         ((cl_double) 1e500)
+-#define CL_MAXFLOAT         CL_FLT_MAX
+-#define CL_INFINITY         CL_HUGE_VALF
+-
+-#else
+-
+-#include <stdint.h>
+-
+-/* scalar types  */
+-typedef int8_t          cl_char;
+-typedef uint8_t         cl_uchar;
+-typedef int16_t         cl_short    __attribute__((aligned(2)));
+-typedef uint16_t        cl_ushort   __attribute__((aligned(2)));
+-typedef int32_t         cl_int      __attribute__((aligned(4)));
+-typedef uint32_t        cl_uint     __attribute__((aligned(4)));
+-typedef int64_t         cl_long     __attribute__((aligned(8)));
+-typedef uint64_t        cl_ulong    __attribute__((aligned(8)));
+-
+-typedef uint16_t        cl_half     __attribute__((aligned(2)));
+-typedef float           cl_float    __attribute__((aligned(4)));
+-typedef double          cl_double   __attribute__((aligned(8)));
+-
+-/* Macro names and corresponding values defined by OpenCL */
+-#define CL_CHAR_BIT         8
+-#define CL_SCHAR_MAX        127
+-#define CL_SCHAR_MIN        (-127-1)
+-#define CL_CHAR_MAX         CL_SCHAR_MAX
+-#define CL_CHAR_MIN         CL_SCHAR_MIN
+-#define CL_UCHAR_MAX        255
+-#define CL_SHRT_MAX         32767
+-#define CL_SHRT_MIN         (-32767-1)
+-#define CL_USHRT_MAX        65535
+-#define CL_INT_MAX          2147483647
+-#define CL_INT_MIN          (-2147483647-1)
+-#define CL_UINT_MAX         0xffffffffU
+-#define CL_LONG_MAX         ((cl_long) 0x7FFFFFFFFFFFFFFFLL)
+-#define CL_LONG_MIN         ((cl_long) -0x7FFFFFFFFFFFFFFFLL - 1LL)
+-#define CL_ULONG_MAX        ((cl_ulong) 0xFFFFFFFFFFFFFFFFULL)
+-
+-#define CL_FLT_DIG          6
+-#define CL_FLT_MANT_DIG     24
+-#define CL_FLT_MAX_10_EXP   +38
+-#define CL_FLT_MAX_EXP      +128
+-#define CL_FLT_MIN_10_EXP   -37
+-#define CL_FLT_MIN_EXP      -125
+-#define CL_FLT_RADIX        2
+-#define CL_FLT_MAX          0x1.fffffep127f
+-#define CL_FLT_MIN          0x1.0p-126f
+-#define CL_FLT_EPSILON      0x1.0p-23f
+-
+-#define CL_DBL_DIG          15
+-#define CL_DBL_MANT_DIG     53
+-#define CL_DBL_MAX_10_EXP   +308
+-#define CL_DBL_MAX_EXP      +1024
+-#define CL_DBL_MIN_10_EXP   -307
+-#define CL_DBL_MIN_EXP      -1021
+-#define CL_DBL_RADIX        2
+-#define CL_DBL_MAX          0x1.fffffffffffffp1023
+-#define CL_DBL_MIN          0x1.0p-1022
+-#define CL_DBL_EPSILON      0x1.0p-52
+-
+-#define  CL_M_E             2.718281828459045090796
+-#define  CL_M_LOG2E         1.442695040888963387005
+-#define  CL_M_LOG10E        0.434294481903251816668
+-#define  CL_M_LN2           0.693147180559945286227
+-#define  CL_M_LN10          2.302585092994045901094
+-#define  CL_M_PI            3.141592653589793115998
+-#define  CL_M_PI_2          1.570796326794896557999
+-#define  CL_M_PI_4          0.785398163397448278999
+-#define  CL_M_1_PI          0.318309886183790691216
+-#define  CL_M_2_PI          0.636619772367581382433
+-#define  CL_M_2_SQRTPI      1.128379167095512558561
+-#define  CL_M_SQRT2         1.414213562373095145475
+-#define  CL_M_SQRT1_2       0.707106781186547572737
+-
+-#define  CL_M_E_F           2.71828174591064f
+-#define  CL_M_LOG2E_F       1.44269502162933f
+-#define  CL_M_LOG10E_F      0.43429449200630f
+-#define  CL_M_LN2_F         0.69314718246460f
+-#define  CL_M_LN10_F        2.30258512496948f
+-#define  CL_M_PI_F          3.14159274101257f
+-#define  CL_M_PI_2_F        1.57079637050629f
+-#define  CL_M_PI_4_F        0.78539818525314f
+-#define  CL_M_1_PI_F        0.31830987334251f
+-#define  CL_M_2_PI_F        0.63661974668503f
+-#define  CL_M_2_SQRTPI_F    1.12837922573090f
+-#define  CL_M_SQRT2_F       1.41421353816986f
+-#define  CL_M_SQRT1_2_F     0.70710676908493f
+-
+-#if defined( __GNUC__ )
+-   #define CL_HUGE_VALF     __builtin_huge_valf()
+-   #define CL_HUGE_VAL      __builtin_huge_val()
+-   #define CL_NAN           __builtin_nanf( "" )
+-#else
+-   #define CL_HUGE_VALF     ((cl_float) 1e50)
+-   #define CL_HUGE_VAL      ((cl_double) 1e500)
+-   float nanf( const char * );
+-   #define CL_NAN           nanf( "" )  
+-#endif
+-#define CL_MAXFLOAT         CL_FLT_MAX
+-#define CL_INFINITY         CL_HUGE_VALF
+-
+-#endif
+-
+-#include <stddef.h>
+-
+-/* Mirror types to GL types. Mirror types allow us to avoid deciding which 87s to load based on whether we are using GL or GLES here. */
+-typedef unsigned int cl_GLuint;
+-typedef int          cl_GLint;
+-typedef unsigned int cl_GLenum;
+-
+-/*
+- * Vector types 
+- *
+- *  Note:   OpenCL requires that all types be naturally aligned. 
+- *          This means that vector types must be naturally aligned.
+- *          For example, a vector of four floats must be aligned to
+- *          a 16 byte boundary (calculated as 4 * the natural 4-byte 
+- *          alignment of the float).  The alignment qualifiers here
+- *          will only function properly if your compiler supports them
+- *          and if you don't actively work to defeat them.  For example,
+- *          in order for a cl_float4 to be 16 byte aligned in a struct,
+- *          the start of the struct must itself be 16-byte aligned. 
+- *
+- *          Maintaining proper alignment is the user's responsibility.
+- */
+-
+-/* Define basic vector types */
+-#if defined( __VEC__ )
+-   #include <altivec.h>   /* may be omitted depending on compiler. AltiVec spec provides no way to detect whether the header is required. */
+-   typedef vector unsigned char     __cl_uchar16;
+-   typedef vector signed char       __cl_char16;
+-   typedef vector unsigned short    __cl_ushort8;
+-   typedef vector signed short      __cl_short8;
+-   typedef vector unsigned int      __cl_uint4;
+-   typedef vector signed int        __cl_int4;
+-   typedef vector float             __cl_float4;
+-   #define  __CL_UCHAR16__  1
+-   #define  __CL_CHAR16__   1
+-   #define  __CL_USHORT8__  1
+-   #define  __CL_SHORT8__   1
+-   #define  __CL_UINT4__    1
+-   #define  __CL_INT4__     1
+-   #define  __CL_FLOAT4__   1
+-#endif
+-
+-#if defined( __SSE__ )
+-    #if defined( __MINGW64__ )
+-        #include <intrin.h>
+-    #else
+-        #include <xmmintrin.h>
+-    #endif
+-    #if defined( __GNUC__ )
+-        typedef float __cl_float4   __attribute__((vector_size(16)));
+-    #else
+-        typedef __m128 __cl_float4;
+-    #endif
+-    #define __CL_FLOAT4__   1
+-#endif
+-
+-#if defined( __SSE2__ )
+-    #if defined( __MINGW64__ )
+-        #include <intrin.h>
+-    #else
+-        #include <emmintrin.h>
+-    #endif
+-    #if defined( __GNUC__ )
+-        typedef cl_uchar    __cl_uchar16    __attribute__((vector_size(16)));
+-        typedef cl_char     __cl_char16     __attribute__((vector_size(16)));
+-        typedef cl_ushort   __cl_ushort8    __attribute__((vector_size(16)));
+-        typedef cl_short    __cl_short8     __attribute__((vector_size(16)));
+-        typedef cl_uint     __cl_uint4      __attribute__((vector_size(16)));
+-        typedef cl_int      __cl_int4       __attribute__((vector_size(16)));
+-        typedef cl_ulong    __cl_ulong2     __attribute__((vector_size(16)));
+-        typedef cl_long     __cl_long2      __attribute__((vector_size(16)));
+-        typedef cl_double   __cl_double2    __attribute__((vector_size(16)));
+-    #else
+-        typedef __m128i __cl_uchar16;
+-        typedef __m128i __cl_char16;
+-        typedef __m128i __cl_ushort8;
+-        typedef __m128i __cl_short8;
+-        typedef __m128i __cl_uint4;
+-        typedef __m128i __cl_int4;
+-        typedef __m128i __cl_ulong2;
+-        typedef __m128i __cl_long2;
+-        typedef __m128d __cl_double2;
+-    #endif
+-    #define __CL_UCHAR16__  1
+-    #define __CL_CHAR16__   1
+-    #define __CL_USHORT8__  1
+-    #define __CL_SHORT8__   1
+-    #define __CL_INT4__     1
+-    #define __CL_UINT4__    1
+-    #define __CL_ULONG2__   1
+-    #define __CL_LONG2__    1
+-    #define __CL_DOUBLE2__  1
+-#endif
+-
+-#if defined( __MMX__ )
+-    #include <mmintrin.h>
+-    #if defined( __GNUC__ )
+-        typedef cl_uchar    __cl_uchar8     __attribute__((vector_size(8)));
+-        typedef cl_char     __cl_char8      __attribute__((vector_size(8)));
+-        typedef cl_ushort   __cl_ushort4    __attribute__((vector_size(8)));
+-        typedef cl_short    __cl_short4     __attribute__((vector_size(8)));
+-        typedef cl_uint     __cl_uint2      __attribute__((vector_size(8)));
+-        typedef cl_int      __cl_int2       __attribute__((vector_size(8)));
+-        typedef cl_ulong    __cl_ulong1     __attribute__((vector_size(8)));
+-        typedef cl_long     __cl_long1      __attribute__((vector_size(8)));
+-        typedef cl_float    __cl_float2     __attribute__((vector_size(8)));
+-    #else
+-        typedef __m64       __cl_uchar8;
+-        typedef __m64       __cl_char8;
+-        typedef __m64       __cl_ushort4;
+-        typedef __m64       __cl_short4;
+-        typedef __m64       __cl_uint2;
+-        typedef __m64       __cl_int2;
+-        typedef __m64       __cl_ulong1;
+-        typedef __m64       __cl_long1;
+-        typedef __m64       __cl_float2;
+-    #endif
+-    #define __CL_UCHAR8__   1
+-    #define __CL_CHAR8__    1
+-    #define __CL_USHORT4__  1
+-    #define __CL_SHORT4__   1
+-    #define __CL_INT2__     1
+-    #define __CL_UINT2__    1
+-    #define __CL_ULONG1__   1
+-    #define __CL_LONG1__    1
+-    #define __CL_FLOAT2__   1
+-#endif
+-
+-#if defined( __AVX__ )
+-    #if defined( __MINGW64__ )
+-        #include <intrin.h>
+-    #else
+-        #include <immintrin.h> 
+-    #endif
+-    #if defined( __GNUC__ )
+-        typedef cl_float    __cl_float8     __attribute__((vector_size(32)));
+-        typedef cl_double   __cl_double4    __attribute__((vector_size(32)));
+-    #else
+-        typedef __m256      __cl_float8;
+-        typedef __m256d     __cl_double4;
+-    #endif
+-    #define __CL_FLOAT8__   1
+-    #define __CL_DOUBLE4__  1
+-#endif
+-
+-/* Define capabilities for anonymous struct members. */
+-#if defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+-#define  __CL_HAS_ANON_STRUCT__ 1
+-#define  __CL_ANON_STRUCT__ __extension__
+-#elif defined( _WIN32) && (_MSC_VER >= 1500)
+-   /* Microsoft Developer Studio 2008 supports anonymous structs, but
+-    * complains by default. */
+-#define  __CL_HAS_ANON_STRUCT__ 1
+-#define  __CL_ANON_STRUCT__
+-   /* Disable warning C4201: nonstandard extension used : nameless
+-    * struct/union */
+-#pragma warning( push )
+-#pragma warning( disable : 4201 )
+-#else
+-#define  __CL_HAS_ANON_STRUCT__ 0
+-#define  __CL_ANON_STRUCT__
+-#endif
+-
+-/* Define alignment keys */
+-#if defined( __GNUC__ )
+-    #define CL_ALIGNED(_x)          __attribute__ ((aligned(_x)))
+-#elif defined( _WIN32) && (_MSC_VER)
+-    /* Alignment keys neutered on windows because MSVC can't swallow function arguments with alignment requirements     */
+-    /* http://msdn.microsoft.com/en-us/library/373ak2y1%28VS.71%29.aspx                                                 */
+-    /* #include <crtdefs.h>                                                                                             */
+-    /* #define CL_ALIGNED(_x)          _CRT_ALIGN(_x)                                                                   */
+-    #define CL_ALIGNED(_x)
+-#else
+-   #warning  Need to implement some method to align data here
+-   #define  CL_ALIGNED(_x)
+-#endif
+-
+-/* Indicate whether .xyzw, .s0123 and .hi.lo are supported */
+-#if __CL_HAS_ANON_STRUCT__
+-    /* .xyzw and .s0123...{f|F} are supported */
+-    #define CL_HAS_NAMED_VECTOR_FIELDS 1
+-    /* .hi and .lo are supported */
+-    #define CL_HAS_HI_LO_VECTOR_FIELDS 1
+-#endif
+-
+-/* Define cl_vector types */
+-
+-/* ---- cl_charn ---- */
+-typedef union
+-{
+-    cl_char  CL_ALIGNED(2) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_char  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_char  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_char  lo, hi; };
+-#endif
+-#if defined( __CL_CHAR2__) 
+-    __cl_char2     v2;
+-#endif
+-}cl_char2;
+-
+-typedef union
+-{
+-    cl_char  CL_ALIGNED(4) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_char  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_char  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_char2 lo, hi; };
+-#endif
+-#if defined( __CL_CHAR2__) 
+-    __cl_char2     v2[2];
+-#endif
+-#if defined( __CL_CHAR4__) 
+-    __cl_char4     v4;
+-#endif
+-}cl_char4;
+-
+-/* cl_char3 is identical in size, alignment and behavior to cl_char4. See section 6.1.5. */
+-typedef  cl_char4  cl_char3;
+-
+-typedef union
+-{
+-    cl_char   CL_ALIGNED(8) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_char  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_char  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_char4 lo, hi; };
+-#endif
+-#if defined( __CL_CHAR2__) 
+-    __cl_char2     v2[4];
+-#endif
+-#if defined( __CL_CHAR4__) 
+-    __cl_char4     v4[2];
+-#endif
+-#if defined( __CL_CHAR8__ )
+-    __cl_char8     v8;
+-#endif
+-}cl_char8;
+-
+-typedef union
+-{
+-    cl_char  CL_ALIGNED(16) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_char  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_char  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_char8 lo, hi; };
+-#endif
+-#if defined( __CL_CHAR2__) 
+-    __cl_char2     v2[8];
+-#endif
+-#if defined( __CL_CHAR4__) 
+-    __cl_char4     v4[4];
+-#endif
+-#if defined( __CL_CHAR8__ )
+-    __cl_char8     v8[2];
+-#endif
+-#if defined( __CL_CHAR16__ )
+-    __cl_char16    v16;
+-#endif
+-}cl_char16;
+-
+-
+-/* ---- cl_ucharn ---- */
+-typedef union
+-{
+-    cl_uchar  CL_ALIGNED(2) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  lo, hi; };
+-#endif
+-#if defined( __cl_uchar2__) 
+-    __cl_uchar2     v2;
+-#endif
+-}cl_uchar2;
+-
+-typedef union
+-{
+-    cl_uchar  CL_ALIGNED(4) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar2 lo, hi; };
+-#endif
+-#if defined( __CL_UCHAR2__) 
+-    __cl_uchar2     v2[2];
+-#endif
+-#if defined( __CL_UCHAR4__) 
+-    __cl_uchar4     v4;
+-#endif
+-}cl_uchar4;
+-
+-/* cl_uchar3 is identical in size, alignment and behavior to cl_uchar4. See section 6.1.5. */
+-typedef  cl_uchar4  cl_uchar3;
+-
+-typedef union
+-{
+-    cl_uchar   CL_ALIGNED(8) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar4 lo, hi; };
+-#endif
+-#if defined( __CL_UCHAR2__) 
+-    __cl_uchar2     v2[4];
+-#endif
+-#if defined( __CL_UCHAR4__) 
+-    __cl_uchar4     v4[2];
+-#endif
+-#if defined( __CL_UCHAR8__ )
+-    __cl_uchar8     v8;
+-#endif
+-}cl_uchar8;
+-
+-typedef union
+-{
+-    cl_uchar  CL_ALIGNED(16) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_uchar8 lo, hi; };
+-#endif
+-#if defined( __CL_UCHAR2__) 
+-    __cl_uchar2     v2[8];
+-#endif
+-#if defined( __CL_UCHAR4__) 
+-    __cl_uchar4     v4[4];
+-#endif
+-#if defined( __CL_UCHAR8__ )
+-    __cl_uchar8     v8[2];
+-#endif
+-#if defined( __CL_UCHAR16__ )
+-    __cl_uchar16    v16;
+-#endif
+-}cl_uchar16;
+-
+-
+-/* ---- cl_shortn ---- */
+-typedef union
+-{
+-    cl_short  CL_ALIGNED(4) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_short  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_short  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_short  lo, hi; };
+-#endif
+-#if defined( __CL_SHORT2__) 
+-    __cl_short2     v2;
+-#endif
+-}cl_short2;
+-
+-typedef union
+-{
+-    cl_short  CL_ALIGNED(8) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_short  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_short  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_short2 lo, hi; };
+-#endif
+-#if defined( __CL_SHORT2__) 
+-    __cl_short2     v2[2];
+-#endif
+-#if defined( __CL_SHORT4__) 
+-    __cl_short4     v4;
+-#endif
+-}cl_short4;
+-
+-/* cl_short3 is identical in size, alignment and behavior to cl_short4. See section 6.1.5. */
+-typedef  cl_short4  cl_short3;
+-
+-typedef union
+-{
+-    cl_short   CL_ALIGNED(16) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_short  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_short  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_short4 lo, hi; };
+-#endif
+-#if defined( __CL_SHORT2__) 
+-    __cl_short2     v2[4];
+-#endif
+-#if defined( __CL_SHORT4__) 
+-    __cl_short4     v4[2];
+-#endif
+-#if defined( __CL_SHORT8__ )
+-    __cl_short8     v8;
+-#endif
+-}cl_short8;
+-
+-typedef union
+-{
+-    cl_short  CL_ALIGNED(32) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_short  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_short  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_short8 lo, hi; };
+-#endif
+-#if defined( __CL_SHORT2__) 
+-    __cl_short2     v2[8];
+-#endif
+-#if defined( __CL_SHORT4__) 
+-    __cl_short4     v4[4];
+-#endif
+-#if defined( __CL_SHORT8__ )
+-    __cl_short8     v8[2];
+-#endif
+-#if defined( __CL_SHORT16__ )
+-    __cl_short16    v16;
+-#endif
+-}cl_short16;
+-
+-
+-/* ---- cl_ushortn ---- */
+-typedef union
+-{
+-    cl_ushort  CL_ALIGNED(4) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  lo, hi; };
+-#endif
+-#if defined( __CL_USHORT2__) 
+-    __cl_ushort2     v2;
+-#endif
+-}cl_ushort2;
+-
+-typedef union
+-{
+-    cl_ushort  CL_ALIGNED(8) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort2 lo, hi; };
+-#endif
+-#if defined( __CL_USHORT2__) 
+-    __cl_ushort2     v2[2];
+-#endif
+-#if defined( __CL_USHORT4__) 
+-    __cl_ushort4     v4;
+-#endif
+-}cl_ushort4;
+-
+-/* cl_ushort3 is identical in size, alignment and behavior to cl_ushort4. See section 6.1.5. */
+-typedef  cl_ushort4  cl_ushort3;
+-
+-typedef union
+-{
+-    cl_ushort   CL_ALIGNED(16) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort4 lo, hi; };
+-#endif
+-#if defined( __CL_USHORT2__) 
+-    __cl_ushort2     v2[4];
+-#endif
+-#if defined( __CL_USHORT4__) 
+-    __cl_ushort4     v4[2];
+-#endif
+-#if defined( __CL_USHORT8__ )
+-    __cl_ushort8     v8;
+-#endif
+-}cl_ushort8;
+-
+-typedef union
+-{
+-    cl_ushort  CL_ALIGNED(32) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_ushort8 lo, hi; };
+-#endif
+-#if defined( __CL_USHORT2__) 
+-    __cl_ushort2     v2[8];
+-#endif
+-#if defined( __CL_USHORT4__) 
+-    __cl_ushort4     v4[4];
+-#endif
+-#if defined( __CL_USHORT8__ )
+-    __cl_ushort8     v8[2];
+-#endif
+-#if defined( __CL_USHORT16__ )
+-    __cl_ushort16    v16;
+-#endif
+-}cl_ushort16;
+-
+-/* ---- cl_intn ---- */
+-typedef union
+-{
+-    cl_int  CL_ALIGNED(8) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_int  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_int  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_int  lo, hi; };
+-#endif
+-#if defined( __CL_INT2__) 
+-    __cl_int2     v2;
+-#endif
+-}cl_int2;
+-
+-typedef union
+-{
+-    cl_int  CL_ALIGNED(16) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_int  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_int  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_int2 lo, hi; };
+-#endif
+-#if defined( __CL_INT2__) 
+-    __cl_int2     v2[2];
+-#endif
+-#if defined( __CL_INT4__) 
+-    __cl_int4     v4;
+-#endif
+-}cl_int4;
+-
+-/* cl_int3 is identical in size, alignment and behavior to cl_int4. See section 6.1.5. */
+-typedef  cl_int4  cl_int3;
+-
+-typedef union
+-{
+-    cl_int   CL_ALIGNED(32) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_int  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_int  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_int4 lo, hi; };
+-#endif
+-#if defined( __CL_INT2__) 
+-    __cl_int2     v2[4];
+-#endif
+-#if defined( __CL_INT4__) 
+-    __cl_int4     v4[2];
+-#endif
+-#if defined( __CL_INT8__ )
+-    __cl_int8     v8;
+-#endif
+-}cl_int8;
+-
+-typedef union
+-{
+-    cl_int  CL_ALIGNED(64) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_int  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_int  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_int8 lo, hi; };
+-#endif
+-#if defined( __CL_INT2__) 
+-    __cl_int2     v2[8];
+-#endif
+-#if defined( __CL_INT4__) 
+-    __cl_int4     v4[4];
+-#endif
+-#if defined( __CL_INT8__ )
+-    __cl_int8     v8[2];
+-#endif
+-#if defined( __CL_INT16__ )
+-    __cl_int16    v16;
+-#endif
+-}cl_int16;
+-
+-
+-/* ---- cl_uintn ---- */
+-typedef union
+-{
+-    cl_uint  CL_ALIGNED(8) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uint  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint  lo, hi; };
+-#endif
+-#if defined( __CL_UINT2__) 
+-    __cl_uint2     v2;
+-#endif
+-}cl_uint2;
+-
+-typedef union
+-{
+-    cl_uint  CL_ALIGNED(16) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uint  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint2 lo, hi; };
+-#endif
+-#if defined( __CL_UINT2__) 
+-    __cl_uint2     v2[2];
+-#endif
+-#if defined( __CL_UINT4__) 
+-    __cl_uint4     v4;
+-#endif
+-}cl_uint4;
+-
+-/* cl_uint3 is identical in size, alignment and behavior to cl_uint4. See section 6.1.5. */
+-typedef  cl_uint4  cl_uint3;
+-
+-typedef union
+-{
+-    cl_uint   CL_ALIGNED(32) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uint  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint4 lo, hi; };
+-#endif
+-#if defined( __CL_UINT2__) 
+-    __cl_uint2     v2[4];
+-#endif
+-#if defined( __CL_UINT4__) 
+-    __cl_uint4     v4[2];
+-#endif
+-#if defined( __CL_UINT8__ )
+-    __cl_uint8     v8;
+-#endif
+-}cl_uint8;
+-
+-typedef union
+-{
+-    cl_uint  CL_ALIGNED(64) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_uint  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_uint8 lo, hi; };
+-#endif
+-#if defined( __CL_UINT2__) 
+-    __cl_uint2     v2[8];
+-#endif
+-#if defined( __CL_UINT4__) 
+-    __cl_uint4     v4[4];
+-#endif
+-#if defined( __CL_UINT8__ )
+-    __cl_uint8     v8[2];
+-#endif
+-#if defined( __CL_UINT16__ )
+-    __cl_uint16    v16;
+-#endif
+-}cl_uint16;
+-
+-/* ---- cl_longn ---- */
+-typedef union
+-{
+-    cl_long  CL_ALIGNED(16) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_long  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_long  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_long  lo, hi; };
+-#endif
+-#if defined( __CL_LONG2__) 
+-    __cl_long2     v2;
+-#endif
+-}cl_long2;
+-
+-typedef union
+-{
+-    cl_long  CL_ALIGNED(32) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_long  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_long  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_long2 lo, hi; };
+-#endif
+-#if defined( __CL_LONG2__) 
+-    __cl_long2     v2[2];
+-#endif
+-#if defined( __CL_LONG4__) 
+-    __cl_long4     v4;
+-#endif
+-}cl_long4;
+-
+-/* cl_long3 is identical in size, alignment and behavior to cl_long4. See section 6.1.5. */
+-typedef  cl_long4  cl_long3;
+-
+-typedef union
+-{
+-    cl_long   CL_ALIGNED(64) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_long  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_long  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_long4 lo, hi; };
+-#endif
+-#if defined( __CL_LONG2__) 
+-    __cl_long2     v2[4];
+-#endif
+-#if defined( __CL_LONG4__) 
+-    __cl_long4     v4[2];
+-#endif
+-#if defined( __CL_LONG8__ )
+-    __cl_long8     v8;
+-#endif
+-}cl_long8;
+-
+-typedef union
+-{
+-    cl_long  CL_ALIGNED(128) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_long  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_long  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_long8 lo, hi; };
+-#endif
+-#if defined( __CL_LONG2__) 
+-    __cl_long2     v2[8];
+-#endif
+-#if defined( __CL_LONG4__) 
+-    __cl_long4     v4[4];
+-#endif
+-#if defined( __CL_LONG8__ )
+-    __cl_long8     v8[2];
+-#endif
+-#if defined( __CL_LONG16__ )
+-    __cl_long16    v16;
+-#endif
+-}cl_long16;
+-
+-
+-/* ---- cl_ulongn ---- */
+-typedef union
+-{
+-    cl_ulong  CL_ALIGNED(16) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  lo, hi; };
+-#endif
+-#if defined( __CL_ULONG2__) 
+-    __cl_ulong2     v2;
+-#endif
+-}cl_ulong2;
+-
+-typedef union
+-{
+-    cl_ulong  CL_ALIGNED(32) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong2 lo, hi; };
+-#endif
+-#if defined( __CL_ULONG2__) 
+-    __cl_ulong2     v2[2];
+-#endif
+-#if defined( __CL_ULONG4__) 
+-    __cl_ulong4     v4;
+-#endif
+-}cl_ulong4;
+-
+-/* cl_ulong3 is identical in size, alignment and behavior to cl_ulong4. See section 6.1.5. */
+-typedef  cl_ulong4  cl_ulong3;
+-
+-typedef union
+-{
+-    cl_ulong   CL_ALIGNED(64) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong4 lo, hi; };
+-#endif
+-#if defined( __CL_ULONG2__) 
+-    __cl_ulong2     v2[4];
+-#endif
+-#if defined( __CL_ULONG4__) 
+-    __cl_ulong4     v4[2];
+-#endif
+-#if defined( __CL_ULONG8__ )
+-    __cl_ulong8     v8;
+-#endif
+-}cl_ulong8;
+-
+-typedef union
+-{
+-    cl_ulong  CL_ALIGNED(128) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_ulong8 lo, hi; };
+-#endif
+-#if defined( __CL_ULONG2__) 
+-    __cl_ulong2     v2[8];
+-#endif
+-#if defined( __CL_ULONG4__) 
+-    __cl_ulong4     v4[4];
+-#endif
+-#if defined( __CL_ULONG8__ )
+-    __cl_ulong8     v8[2];
+-#endif
+-#if defined( __CL_ULONG16__ )
+-    __cl_ulong16    v16;
+-#endif
+-}cl_ulong16;
+-
+-
+-/* --- cl_floatn ---- */
+-
+-typedef union
+-{
+-    cl_float  CL_ALIGNED(8) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_float  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_float  s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_float  lo, hi; };
+-#endif
+-#if defined( __CL_FLOAT2__) 
+-    __cl_float2     v2;
+-#endif
+-}cl_float2;
+-
+-typedef union
+-{
+-    cl_float  CL_ALIGNED(16) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_float   x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_float   s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_float2  lo, hi; };
+-#endif
+-#if defined( __CL_FLOAT2__) 
+-    __cl_float2     v2[2];
+-#endif
+-#if defined( __CL_FLOAT4__) 
+-    __cl_float4     v4;
+-#endif
+-}cl_float4;
+-
+-/* cl_float3 is identical in size, alignment and behavior to cl_float4. See section 6.1.5. */
+-typedef  cl_float4  cl_float3;
+-
+-typedef union
+-{
+-    cl_float   CL_ALIGNED(32) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_float   x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_float   s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_float4  lo, hi; };
+-#endif
+-#if defined( __CL_FLOAT2__) 
+-    __cl_float2     v2[4];
+-#endif
+-#if defined( __CL_FLOAT4__) 
+-    __cl_float4     v4[2];
+-#endif
+-#if defined( __CL_FLOAT8__ )
+-    __cl_float8     v8;
+-#endif
+-}cl_float8;
+-
+-typedef union
+-{
+-    cl_float  CL_ALIGNED(64) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_float  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_float  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_float8 lo, hi; };
+-#endif
+-#if defined( __CL_FLOAT2__) 
+-    __cl_float2     v2[8];
+-#endif
+-#if defined( __CL_FLOAT4__) 
+-    __cl_float4     v4[4];
+-#endif
+-#if defined( __CL_FLOAT8__ )
+-    __cl_float8     v8[2];
+-#endif
+-#if defined( __CL_FLOAT16__ )
+-    __cl_float16    v16;
+-#endif
+-}cl_float16;
+-
+-/* --- cl_doublen ---- */
+-
+-typedef union
+-{
+-    cl_double  CL_ALIGNED(16) s[2];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_double  x, y; };
+-   __CL_ANON_STRUCT__ struct{ cl_double s0, s1; };
+-   __CL_ANON_STRUCT__ struct{ cl_double lo, hi; };
+-#endif
+-#if defined( __CL_DOUBLE2__) 
+-    __cl_double2     v2;
+-#endif
+-}cl_double2;
+-
+-typedef union
+-{
+-    cl_double  CL_ALIGNED(32) s[4];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_double  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_double  s0, s1, s2, s3; };
+-   __CL_ANON_STRUCT__ struct{ cl_double2 lo, hi; };
+-#endif
+-#if defined( __CL_DOUBLE2__) 
+-    __cl_double2     v2[2];
+-#endif
+-#if defined( __CL_DOUBLE4__) 
+-    __cl_double4     v4;
+-#endif
+-}cl_double4;
+-
+-/* cl_double3 is identical in size, alignment and behavior to cl_double4. See section 6.1.5. */
+-typedef  cl_double4  cl_double3;
+-
+-typedef union
+-{
+-    cl_double   CL_ALIGNED(64) s[8];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_double  x, y, z, w; };
+-   __CL_ANON_STRUCT__ struct{ cl_double  s0, s1, s2, s3, s4, s5, s6, s7; };
+-   __CL_ANON_STRUCT__ struct{ cl_double4 lo, hi; };
+-#endif
+-#if defined( __CL_DOUBLE2__) 
+-    __cl_double2     v2[4];
+-#endif
+-#if defined( __CL_DOUBLE4__) 
+-    __cl_double4     v4[2];
+-#endif
+-#if defined( __CL_DOUBLE8__ )
+-    __cl_double8     v8;
+-#endif
+-}cl_double8;
+-
+-typedef union
+-{
+-    cl_double  CL_ALIGNED(128) s[16];
+-#if __CL_HAS_ANON_STRUCT__
+-   __CL_ANON_STRUCT__ struct{ cl_double  x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+-   __CL_ANON_STRUCT__ struct{ cl_double  s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+-   __CL_ANON_STRUCT__ struct{ cl_double8 lo, hi; };
+-#endif
+-#if defined( __CL_DOUBLE2__) 
+-    __cl_double2     v2[8];
+-#endif
+-#if defined( __CL_DOUBLE4__) 
+-    __cl_double4     v4[4];
+-#endif
+-#if defined( __CL_DOUBLE8__ )
+-    __cl_double8     v8[2];
+-#endif
+-#if defined( __CL_DOUBLE16__ )
+-    __cl_double16    v16;
+-#endif
+-}cl_double16;
+-
+-/* Macro to facilitate debugging 
+- * Usage:
+- *   Place CL_PROGRAM_STRING_DEBUG_INFO on the line before the first line of your source. 
+- *   The first line ends with:   CL_PROGRAM_STRING_DEBUG_INFO \"
+- *   Each line thereafter of OpenCL C source must end with: \n\
+- *   The last line ends in ";
+- *
+- *   Example:
+- *
+- *   const char *my_program = CL_PROGRAM_STRING_DEBUG_INFO "\
+- *   kernel void foo( int a, float * b )             \n\
+- *   {                                               \n\
+- *      // my comment                                \n\
+- *      *b[ get_global_id(0)] = a;                   \n\
+- *   }                                               \n\
+- *   ";
+- *
+- * This should correctly set up the line, (column) and file information for your source 
+- * string so you can do source level debugging.
+- */
+-#define  __CL_STRINGIFY( _x )               # _x
+-#define  _CL_STRINGIFY( _x )                __CL_STRINGIFY( _x )
+-#define  CL_PROGRAM_STRING_DEBUG_INFO       "#line "  _CL_STRINGIFY(__LINE__) " \"" __FILE__ "\" \n\n" 
+-  
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#undef __CL_HAS_ANON_STRUCT__
+-#undef __CL_ANON_STRUCT__
+-#if defined( _WIN32) && (_MSC_VER >= 1500)
+-#pragma warning( pop )
+-#endif
+-
+-#endif  /* __CL_PLATFORM_H  */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/oclgrind.git



More information about the Pkg-opencl-commits mailing list