[Pkg-opencl-devel] [beignet] 01/47: Imported Debian patch 0.0.0+git2013.04.01+d1b234c-1
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Oct 31 21:45:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository beignet.
commit c3d501c9599a53d8d882a5dc6965cb203dc5946c
Author: Simon Richter <sjr at debian.org>
Date: Tue Apr 9 17:14:00 2013 +0200
Imported Debian patch 0.0.0+git2013.04.01+d1b234c-1
---
debian/beignet-dev.install | 3 +
debian/beignet0.0.1.install | 2 +
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 30 +
debian/copyright | 56 +
debian/patches/clang-from-path | 18 +
debian/patches/fix-clean | 23 +
debian/patches/implement-gefa | 21 +
debian/patches/khronos | 2853 ++++++++++++++++++++++++++++++++++++++++
debian/patches/missing-header | 14 +
debian/patches/path | 21 +
debian/patches/respect-flags | 54 +
debian/patches/series | 9 +
debian/patches/soname | 30 +
debian/patches/verbose | 16 +
debian/rules | 8 +
debian/source/format | 1 +
18 files changed, 3165 insertions(+)
diff --git a/debian/beignet-dev.install b/debian/beignet-dev.install
new file mode 100644
index 0000000..3a15101
--- /dev/null
+++ b/debian/beignet-dev.install
@@ -0,0 +1,3 @@
+libcl.so /usr/lib
+backend/libgbe.so /usr/lib
+include/CL/cl_intel.h /usr/include/CL
diff --git a/debian/beignet0.0.1.install b/debian/beignet0.0.1.install
new file mode 100644
index 0000000..167fb0b
--- /dev/null
+++ b/debian/beignet0.0.1.install
@@ -0,0 +1,2 @@
+libcl.so.* /usr/lib
+backend/libgbe.so.* /usr/lib
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..ae6de27
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+beignet (0.0.0+git2013.04.01+d1b234c-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Simon Richter <sjr at debian.org> Tue, 09 Apr 2013 17:14:00 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..7d9f04b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,30 @@
+Source: beignet
+Priority: extra
+Maintainer: Simon Richter <sjr at debian.org>
+Build-Depends: debhelper (>= 9.0.0), pkg-config, ocl-icd-dev, opencl-headers, libdrm-dev, libxfixes-dev, libxext-dev, llvm-dev (>= 1:3.0)
+Standards-Version: 3.9.3
+Section: libs
+Homepage: http://cgit.freedesktop.org/beignet/
+
+Package: beignet-dev
+Section: libdevel
+Architecture: linux-any
+Depends: beignet0.0.1 (= ${binary:Version}), ${misc:Depends}
+Description: Intel OpenCL library
+ OpenCL (Open Computing Language) is a multivendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This package contains the development files for directly linking against
+ the Intel implementation.
+
+Package: beignet0.0.1
+Section: libs
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang
+Description: Intel OpenCL library
+ OpenCL (Open Computing Language) is a multivendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This package contains the shared library for the Intel implementation.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..4c6b910
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,56 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: beignet
+Source: http://cgit.freedesktop.org/beignet/
+
+Files: *
+Copyright: 2012 Intel Corporation
+License: LGPL-2.0+
+
+Files: backend/src/sys/intrusive_list.*
+Copyright: 2007 Maciej Sinilo
+License: MIT
+
+Files: backend/src/backend/gen_register.hpp
+Copyright: 2012 Intel Corporation
+License: MIT
+
+Files: debian/*
+Copyright: 2013 Simon Richter <sjr at debian.org>
+License: LGPL-2.0+
+
+License: LGPL-2.0+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice (including the next
+ paragraph) shall be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/debian/patches/clang-from-path b/debian/patches/clang-from-path
new file mode 100644
index 0000000..aec7c66
--- /dev/null
+++ b/debian/patches/clang-from-path
@@ -0,0 +1,18 @@
+Description: Use clang from PATH
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-02
+
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/backend/src/backend/program.cpp
++++ beignet-0.0.0+git2013.04.01+d1b234c/backend/src/backend/program.cpp
+@@ -116,9 +116,9 @@ namespace gbe {
+
+ // Now compile the code to llvm using clang
+ #if LLVM_VERSION_MINOR <= 1
+- std::string compileCmd = LLVM_PREFIX "/bin/clang -x cl -fno-color-diagnostics -emit-llvm -O3 -ccc-host-triple ptx32 -c ";
++ std::string compileCmd = "clang -x cl -fno-color-diagnostics -emit-llvm -O3 -ccc-host-triple ptx32 -c ";
+ #else
+- std::string compileCmd = LLVM_PREFIX "/bin/clang -ffp-contract=off -target nvptx -x cl -fno-color-diagnostics -emit-llvm -O3 -c ";
++ std::string compileCmd = "clang -ffp-contract=off -target nvptx -x cl -fno-color-diagnostics -emit-llvm -O3 -c ";
+ #endif /* LLVM_VERSION_MINOR <= 1 */
+ compileCmd += clName;
+ compileCmd += " -o ";
diff --git a/debian/patches/fix-clean b/debian/patches/fix-clean
new file mode 100644
index 0000000..4f9b581
--- /dev/null
+++ b/debian/patches/fix-clean
@@ -0,0 +1,23 @@
+Description: Fix cleaning
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-01
+
+Index: beignet-0.0.0+git2013.04.01+d1b234c/backend/Makefile
+===================================================================
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/backend/Makefile 2013-04-01 04:00:50.847138659 +0200
++++ beignet-0.0.0+git2013.04.01+d1b234c/backend/Makefile 2013-04-01 04:00:55.667138444 +0200
+@@ -1,4 +1,4 @@
+ TOP=.
+-SUBDIRS=src/backend src/backend/gen src/backend/sim src/ir src/llvm src/sys
++SUBDIRS=src src/backend src/backend/gen src/backend/sim src/ir src/llvm src/sys
+
+ include $(TOP)/Makefile.shared
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/utests/Makefile
++++ beignet-0.0.0+git2013.04.01+d1b234c/utests/Makefile
+@@ -74,5 +74,6 @@ runtime_flat_address_space: $(OBJ) runti
+
+ clean:
+ rm -f $(OBJ)
++ rm -f *.bmp
+ rm -f utest_run utest_run.o
+ rm -f runtime_flat_address_space runtime_flat_address_space.o
diff --git a/debian/patches/implement-gefa b/debian/patches/implement-gefa
new file mode 100644
index 0000000..1e1792e
--- /dev/null
+++ b/debian/patches/implement-gefa
@@ -0,0 +1,21 @@
+commit 08dadaf3f345f3feceefaacebf5045c72821b449
+Author: Simon Richter <Simon.Richter at hogyros.de>
+Date: Tue Apr 2 15:11:01 2013 +0200
+
+ "Implement" clGetExtensionFunctionAddress()
+
+ This function can legally return NULL in the current implementation.
+
+diff --git a/src/cl_api.c b/src/cl_api.c
+index 6856d6a..253c29c 100644
+--- a/src/cl_api.c
++++ b/src/cl_api.c
+@@ -1109,7 +1109,7 @@ clEnqueueBarrier(cl_command_queue command_queue)
+ void*
+ clGetExtensionFunctionAddress(const char *func_name)
+ {
+- NOT_IMPLEMENTED;
++ /* No extensions supported at present */
+ return NULL;
+ }
+
diff --git a/debian/patches/khronos b/debian/patches/khronos
new file mode 100644
index 0000000..fd750b7
--- /dev/null
+++ b/debian/patches/khronos
@@ -0,0 +1,2853 @@
+Description: Use Khronos Group headers
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-01
+
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/include/CL/cl_ext.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/include/CL/cl_ext.h
+@@ -1,209 +1 @@
+-/*
+- * Copyright © 2012 Intel Corporation
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+- *
+- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
+- */
+-
+-/* $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_fp64 extension - no extension #define since it has no functions */
+-#define CL_DEVICE_DOUBLE_FP_CONFIG 0x1032
+-
+-/* 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 */);
+-
+-
+-/******************************************
+-* 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)
+-
+-
+-
+-#endif /* CL_VERSION_1_1 */
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-
+-#endif /* __CL_EXT_H */
++#include_next <CL/cl_ext.h>
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/include/CL/opencl.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/include/CL/opencl.h
+@@ -1,50 +1 @@
+-/*
+- * Copyright © 2012 Intel Corporation
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+- *
+- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
+- */
+-
+-/* $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 */
+-
++#include_next <CL/opencl.h>
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/include/CL/cl_d3d10.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/include/CL/cl_d3d10.h
+@@ -1,129 +1 @@
+-/*
+- * Copyright © 2012 Intel Corporation
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+- *
+- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
+- */
+-
+-/* $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
+-
+-#ifdef __D3D10__
+-#include <d3d10.h>
+-#endif
+-#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
+-
+-/******************************************************************************/
+-#ifndef __D3D10__
+-typedef struct {int i;} ID3D10Buffer;
+-typedef struct {int i;} ID3D10Texture2D;
+-typedef struct {int i;} ID3D10Texture3D;
+-#endif
+-
+-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,
+- 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
+-
++#include_next <CL/cl_d3d10.h>
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/include/CL/cl.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/include/CL/cl.h
+@@ -1,994 +1 @@
+-/*
+- * Copyright © 2012 Intel Corporation
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+- *
+- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
+- */
+-
+-/* $Revision: 11985 $ on $Date: 2010-07-15 11:16:06 -0700 (Thu, 15 Jul 2010) $ */
+-
+-#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_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_type;
+-typedef cl_uint cl_mem_info;
+-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_int cl_build_status;
+-typedef cl_uint cl_kernel_info;
+-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_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_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_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 -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
+-
+-/* OpenCL Version */
+-#define CL_VERSION_1_0 1
+-#define CL_VERSION_1_1 1
+-
+-/* cl_bool */
+-#define CL_FALSE 0
+-#define CL_TRUE 1
+-
+-/* 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_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
+-/* 0x1032 reserved for CL_DEVICE_DOUBLE_FP_CONFIG */
+-/* 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
+-
+-/* 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)
+-
+-/* 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_info + cl_context_properties */
+-#define CL_CONTEXT_PLATFORM 0x1084
+-
+-/* 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)
+-
+-/* 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
+-
+-/* 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
+-
+-/* cl_mem_type */
+-#define CL_MEM_OBJECT_BUFFER 0x10F0
+-#define CL_MEM_OBJECT_IMAGE2D 0x10F1
+-#define CL_MEM_OBJECT_IMAGE3D 0x10F2
+-
+-/* 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
+-
+-/* 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)
+-
+-/* 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
+-
+-/* cl_program_build_info */
+-#define CL_PROGRAM_BUILD_STATUS 0x1181
+-#define CL_PROGRAM_BUILD_OPTIONS 0x1182
+-#define CL_PROGRAM_BUILD_LOG 0x1183
+-
+-/* 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
+-
+-/* 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
+-
+-/* 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
+-
+-/* 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;
+-
+-/* 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;
+-
+-#ifdef CL_USE_DEPRECATED_OPENCL_1_0_APIS
+-#warning CL_USE_DEPRECATED_OPENCL_1_0_APIS is defined. These APIs are unsupported and untested in OpenCL 1.1!
+-/*
+- * WARNING:
+- * This API introduces mutable state into the OpenCL implementation. It has been REMOVED
+- * to better facilitate thread safety. The 1.0 API is not thread safe. It is not tested by the
+- * OpenCL 1.1 conformance test, and consequently may not work or may not work dependably.
+- * It is likely to be non-performant. Use of this API is not advised. Use at your own risk.
+- *
+- * Software developers previously relying on this API are instructed to set the command queue
+- * properties when creating the queue, instead.
+- */
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clSetCommandQueueProperty(cl_command_queue /* command_queue */,
+- cl_command_queue_properties /* properties */,
+- cl_bool /* enable */,
+- cl_command_queue_properties * /* old_properties */) CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED;
+-#endif /* CL_USE_DEPRECATED_OPENCL_1_0_APIS */
+-
+-/* 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
+-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_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY 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_API_SUFFIX__VERSION_1_0;
+-
+-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_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_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
+-clUnloadCompiler(void) CL_API_SUFFIX__VERSION_1_0;
+-
+-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
+-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 /* cb */,
+- 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_origin */,
+- const size_t * /* host_origin */,
+- 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 /* cb */,
+- 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_origin */,
+- const size_t * /* host_origin */,
+- 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
+-clEnqueueCopyBuffer(cl_command_queue /* command_queue */,
+- cl_mem /* src_buffer */,
+- cl_mem /* dst_buffer */,
+- size_t /* src_offset */,
+- size_t /* dst_offset */,
+- size_t /* cb */,
+- 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
+-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 /* cb */,
+- 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
+-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 (*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
+-clEnqueueMarker(cl_command_queue /* command_queue */,
+- cl_event * /* event */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueWaitForEvents(cl_command_queue /* command_queue */,
+- cl_uint /* num_events */,
+- const cl_event * /* event_list */) CL_API_SUFFIX__VERSION_1_0;
+-
+-extern CL_API_ENTRY cl_int CL_API_CALL
+-clEnqueueBarrier(cl_command_queue /* command_queue */) CL_API_SUFFIX__VERSION_1_0;
+-
+-/* 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 clGetExtensionFunctionAddress(const char * /* func_name */) CL_API_SUFFIX__VERSION_1_0;
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* __OPENCL_CL_H */
+-
++#include_next <CL/cl.h>
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/include/CL/cl_platform.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/include/CL/cl_platform.h
+@@ -1,1194 +1 @@
+-/*
+- * Copyright © 2012 Intel Corporation
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+- *
+- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
+- */
+-
+-/* $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 CL_EXTENSION_WEAK_LINK
+- #define CL_EXT_SUFFIX__VERSION_1_1 CL_EXTENSION_WEAK_LINK
+- #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED CL_EXTENSION_WEAK_LINK AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+-#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_EXT_SUFFIX__VERSION_1_0_DEPRECATED
+-#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 MAKE_HEX_DOUBLE(0x1.0p-23f, 0x1L, -23)
+-
+-#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 headers 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 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- /* .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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_char x, y; };
+- __extension__ struct{ cl_char s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_char x, y, z, w; };
+- __extension__ struct{ cl_char s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_char x, y, z, w; };
+- __extension__ struct{ cl_char s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_char x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_char s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uchar x, y; };
+- __extension__ struct{ cl_uchar s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uchar x, y, z, w; };
+- __extension__ struct{ cl_uchar s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uchar x, y, z, w; };
+- __extension__ struct{ cl_uchar s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uchar x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_uchar s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_short x, y; };
+- __extension__ struct{ cl_short s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_short x, y, z, w; };
+- __extension__ struct{ cl_short s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_short x, y, z, w; };
+- __extension__ struct{ cl_short s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_short x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_short s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ushort x, y; };
+- __extension__ struct{ cl_ushort s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ushort x, y, z, w; };
+- __extension__ struct{ cl_ushort s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ushort x, y, z, w; };
+- __extension__ struct{ cl_ushort s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ushort x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_ushort s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_int x, y; };
+- __extension__ struct{ cl_int s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_int x, y, z, w; };
+- __extension__ struct{ cl_int s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_int x, y, z, w; };
+- __extension__ struct{ cl_int s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_int x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_int s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uint x, y; };
+- __extension__ struct{ cl_uint s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uint x, y, z, w; };
+- __extension__ struct{ cl_uint s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uint x, y, z, w; };
+- __extension__ struct{ cl_uint s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_uint x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_uint s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_long x, y; };
+- __extension__ struct{ cl_long s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_long x, y, z, w; };
+- __extension__ struct{ cl_long s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_long x, y, z, w; };
+- __extension__ struct{ cl_long s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_long x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_long s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ulong x, y; };
+- __extension__ struct{ cl_ulong s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ulong x, y, z, w; };
+- __extension__ struct{ cl_ulong s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ulong x, y, z, w; };
+- __extension__ struct{ cl_ulong s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_ulong x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_ulong s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_float x, y; };
+- __extension__ struct{ cl_float s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_float x, y, z, w; };
+- __extension__ struct{ cl_float s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_float x, y, z, w; };
+- __extension__ struct{ cl_float s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_float x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_float s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_double x, y; };
+- __extension__ struct{ cl_double s0, s1; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_double x, y, z, w; };
+- __extension__ struct{ cl_double s0, s1, s2, s3; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_double x, y, z, w; };
+- __extension__ struct{ cl_double s0, s1, s2, s3, s4, s5, s6, s7; };
+- __extension__ 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 defined( __GNUC__) && ! defined( __STRICT_ANSI__ )
+- __extension__ struct{ cl_double x, y, z, w, __spacer4, __spacer5, __spacer6, __spacer7, __spacer8, __spacer9, sa, sb, sc, sd, se, sf; };
+- __extension__ struct{ cl_double s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, sA, sB, sC, sD, sE, sF; };
+- __extension__ 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_BEGIN \"
+- * Each line thereafter of OpenCL C source must end with: \n\
+- * The last line ends in ";
+- *
+- * Example:
+- *
+- * const char *my_program = CL_PROGRAM_STRING_BEGIN "\
+- * 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
+-
+-#endif /* __CL_PLATFORM_H */
++#include_next <CL/cl_platform.h>
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/include/CL/cl_gl.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/include/CL/cl_gl.h
+@@ -1,151 +1 @@
+-/*
+- * Copyright © 2012 Intel Corporation
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public
+- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+- *
+- * Author: Benjamin Segovia <benjamin.segovia at intel.com>
+- */
+-
+-/* $Revision: 11708 $ on $Date: 2010-06-13 23:36:24 -0700 (Sun, 13 Jun 2010) $ */
+-
+-/*
+- * cl_gl.h contains Khronos-approved (KHR) OpenCL extensions which have
+- * OpenGL dependencies. The application is responsible for #including
+- * OpenGL or OpenGL ES headers before #including cl_gl.h.
+- */
+-
+-#ifndef __OPENCL_CL_GL_H
+-#define __OPENCL_CL_GL_H
+-
+-#ifdef __APPLE__
+-#include <OpenCL/cl.h>
+-#include <OpenGL/CGLDevice.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 */
+-#define CL_GL_OBJECT_BUFFER 0x2000
+-#define CL_GL_OBJECT_TEXTURE2D 0x2001
+-#define CL_GL_OBJECT_TEXTURE3D 0x2002
+-#define CL_GL_OBJECT_RENDERBUFFER 0x2003
+-
+-/* cl_gl_texture_info */
+-#define CL_GL_TEXTURE_TARGET 0x2004
+-#define CL_GL_MIPMAP_LEVEL 0x2005
+-
+-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
+-clCreateFromGLTexture2D(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_0;
+-
+-extern CL_API_ENTRY 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_API_SUFFIX__VERSION_1_0;
+-
+-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;
+-
+-/* 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 */
++#include_next <CL/cl_gl.h>
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/src/cl_image.c
++++ beignet-0.0.0+git2013.04.01+d1b234c/src/cl_image.c
+@@ -189,7 +189,7 @@ static const size_t cl_image_type_n = SI
+
+ cl_int
+ cl_image_get_supported_fmt(cl_context ctx,
+- cl_mem_type image_type,
++ cl_mem_object_type image_type,
+ cl_uint num_entries,
+ cl_image_format *image_formats,
+ cl_uint *num_image_formats)
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/src/cl_utils.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/src/cl_utils.h
+@@ -121,11 +121,11 @@ do {
+ #define CHECK_MEM(MEM) \
+ do { \
+ if (UNLIKELY(MEM == NULL)) { \
+- err = CL_INVALID_MEM; \
++ err = CL_INVALID_MEM_OBJECT; \
+ goto error; \
+ } \
+ if (UNLIKELY(MEM->magic != CL_MAGIC_MEM_HEADER)) { \
+- err = CL_INVALID_MEM; \
++ err = CL_INVALID_MEM_OBJECT; \
+ goto error; \
+ } \
+ } while (0)
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/src/cl_mem.c
++++ beignet-0.0.0+git2013.04.01+d1b234c/src/cl_mem.c
+@@ -67,7 +67,7 @@ cl_mem_allocate(cl_context ctx,
+ assert(bufmgr);
+ mem->bo = cl_buffer_alloc(bufmgr, "CL memory object", sz, alignment);
+ if (UNLIKELY(mem->bo == NULL)) {
+- err = CL_MEM_ALLOCATION_FAILURE;
++ err = CL_MEM_OBJECT_ALLOCATION_FAILURE;
+ goto error;
+ }
+
+@@ -376,7 +376,7 @@ cl_mem_pin(cl_mem mem)
+ {
+ assert(mem);
+ if (UNLIKELY((mem->flags & CL_MEM_PINNABLE) == 0))
+- return CL_INVALID_MEM;
++ return CL_INVALID_MEM_OBJECT;
+ cl_buffer_pin(mem->bo, 4096);
+ return CL_SUCCESS;
+ }
+@@ -386,7 +386,7 @@ cl_mem_unpin(cl_mem mem)
+ {
+ assert(mem);
+ if (UNLIKELY((mem->flags & CL_MEM_PINNABLE) == 0))
+- return CL_INVALID_MEM;
++ return CL_INVALID_MEM_OBJECT;
+ cl_buffer_unpin(mem->bo);
+ return CL_SUCCESS;
+ }
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/src/cl_api.c
++++ beignet-0.0.0+git2013.04.01+d1b234c/src/cl_api.c
+@@ -306,7 +306,7 @@ error:
+ cl_int
+ clGetSupportedImageFormats(cl_context ctx,
+ cl_mem_flags flags,
+- cl_mem_type image_type,
++ cl_mem_object_type image_type,
+ cl_uint num_entries,
+ cl_image_format *image_formats,
+ cl_uint * num_image_formats)
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/src/cl_image.h
++++ beignet-0.0.0+git2013.04.01+d1b234c/src/cl_image.h
+@@ -35,7 +35,7 @@ extern uint32_t cl_image_get_intel_forma
+
+ /* Return the list of formats supported by the API */
+ extern cl_int cl_image_get_supported_fmt(cl_context context,
+- cl_mem_type image_type,
++ cl_mem_object_type image_type,
+ cl_uint num_entries,
+ cl_image_format *image_formats,
+ cl_uint *num_image_formats);
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/utests/utest_error.c
++++ beignet-0.0.0+git2013.04.01+d1b234c/utests/utest_error.c
+@@ -25,7 +25,7 @@ const char *err_msg[] = {
+ [-CL_DEVICE_NOT_FOUND] = "CL_DEVICE_NOT_FOUND",
+ [-CL_DEVICE_NOT_AVAILABLE] = "CL_DEVICE_NOT_AVAILABLE",
+ [-CL_COMPILER_NOT_AVAILABLE] = "CL_COMPILER_NOT_AVAILABLE",
+- [-CL_MEM_ALLOCATION_FAILURE] = "CL_MEM_ALLOCATION_FAILURE",
++ [-CL_MEM_OBJECT_ALLOCATION_FAILURE] = "CL_MEM_OBJECT_ALLOCATION_FAILURE",
+ [-CL_OUT_OF_RESOURCES] = "CL_OUT_OF_RESOURCES",
+ [-CL_OUT_OF_HOST_MEMORY] = "CL_OUT_OF_HOST_MEMORY",
+ [-CL_PROFILING_INFO_NOT_AVAILABLE] = "CL_PROFILING_INFO_NOT_AVAILABLE",
+@@ -44,7 +44,7 @@ const char *err_msg[] = {
+ [-CL_INVALID_QUEUE_PROPERTIES] = "CL_INVALID_QUEUE_PROPERTIES",
+ [-CL_INVALID_COMMAND_QUEUE] = "CL_INVALID_COMMAND_QUEUE",
+ [-CL_INVALID_HOST_PTR] = "CL_INVALID_HOST_PTR",
+- [-CL_INVALID_MEM] = "CL_INVALID_MEM",
++ [-CL_INVALID_MEM_OBJECT] = "CL_INVALID_MEM_OBJECT",
+ [-CL_INVALID_IMAGE_FORMAT_DESCRIPTOR] = "CL_INVALID_IMAGE_FORMAT_DESCRIPTOR",
+ [-CL_INVALID_IMAGE_SIZE] = "CL_INVALID_IMAGE_SIZE",
+ [-CL_INVALID_SAMPLER] = "CL_INVALID_SAMPLER",
diff --git a/debian/patches/missing-header b/debian/patches/missing-header
new file mode 100644
index 0000000..8b61251
--- /dev/null
+++ b/debian/patches/missing-header
@@ -0,0 +1,14 @@
+Description: Fix missing include
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-03
+
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/backend/src/sys/alloc.hpp
++++ beignet-0.0.0+git2013.04.01+d1b234c/backend/src/sys/alloc.hpp
+@@ -27,6 +27,7 @@
+ #include "sys/platform.hpp"
+ #include "sys/assert.hpp"
+ #include <algorithm>
++#include <limits>
+
+ namespace gbe
+ {
diff --git a/debian/patches/path b/debian/patches/path
new file mode 100644
index 0000000..dfdf558
--- /dev/null
+++ b/debian/patches/path
@@ -0,0 +1,21 @@
+Description: Fix linker path
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-01
+
+Index: beignet-0.0.0+git2013.04.01+d1b234c/utests/Makefile
+===================================================================
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/utests/Makefile 2013-04-04 13:12:58.000000000 +0200
++++ beignet-0.0.0+git2013.04.01+d1b234c/utests/Makefile 2013-04-04 13:13:31.575880044 +0200
+@@ -67,10 +67,10 @@
+ all: utest_run runtime_flat_address_space
+
+ utest_run: $(OBJ) utest_run.o $(TOP)/$(LIBBASE)
+- $(CXX) -o $@ $(OBJ) utest_run.o $(TOP)/$(LIBBASE)
++ $(CXX) -o $@ $(OBJ) utest_run.o -L$(TOP)/backend -Wl,-rpath,$(TOP)/backend -Wl,-rpath,$(TOP) $(TOP)/$(LIBBASE)
+
+ runtime_flat_address_space: $(OBJ) runtime_flat_address_space.o
+- $(CXX) -o $@ $(OBJ) runtime_flat_address_space.o $(TOP)/$(LIBBASE)
++ $(CXX) -o $@ $(OBJ) runtime_flat_address_space.o -Wl,-rpath,$(TOP)/backend -Wl,-rpath,$(TOP) $(TOP)/$(LIBBASE)
+
+ clean:
+ rm -f $(OBJ)
diff --git a/debian/patches/respect-flags b/debian/patches/respect-flags
new file mode 100644
index 0000000..b985093
--- /dev/null
+++ b/debian/patches/respect-flags
@@ -0,0 +1,54 @@
+Description: Respect external CFLAGS/CXXFLAGS/LDFLAGS
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-04
+
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/Makefile.lib
++++ beignet-0.0.0+git2013.04.01+d1b234c/Makefile.lib
+@@ -7,7 +7,7 @@ LIBS=-Wl,--no-undefined $(LIB_BACKEND) $
+ all: $(LIB) $(LIBMAJOR) $(LIBBASE)
+
+ $(LIB): $(OBJ) $(LIB_BACKEND)
+- $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(LIBMAJOR) -o $@ $(OBJ) $(LIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBMAJOR) -o $@ $(OBJ) $(LIBS)
+
+ $(LIBMAJOR): $(LIB)
+ rm -f $@
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/Makefile.defs
++++ beignet-0.0.0+git2013.04.01+d1b234c/Makefile.defs
+@@ -24,9 +24,9 @@ LOCAL_LIBS=$(DRM_LIBS) $(XEXT_LIBS)
+
+ LOCAL_CXXFLAGS=$(LOCAL_CFLAGS) -std=c++0x -fno-rtti -Wno-invalid-offsetof
+
+-CXXFLAGS=$(LOCAL_CXXFLAGS) $(LLVM_CXXFLAGS) $(DIR_CXXFLAGS)
++CXXFLAGS+=$(LOCAL_CXXFLAGS) $(LLVM_CXXFLAGS) $(DIR_CXXFLAGS)
+
+-CFLAGS=$(LLVM_CFLAGS) $(LOCAL_CFLAGS) $(DIR_CFLAGS) -std=c99
++CFLAGS+=$(LLVM_CFLAGS) $(LOCAL_CFLAGS) $(DIR_CFLAGS) -std=c99
+
+ INC=$(shell for i in $(SUBDIRS); do ls $$i/*.h* 2>/dev/null; done)
+
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/backend/Makefile.lib
++++ beignet-0.0.0+git2013.04.01+d1b234c/backend/Makefile.lib
+@@ -9,7 +9,7 @@ VERSION=0.0.1
+ all: $(LIB) $(LIBMAJOR) $(LIBBASE)
+
+ $(LIB): $(OBJ)
+- $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(LIBMAJOR) -o $@ $(OBJ) $(LIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBMAJOR) -o $@ $(OBJ) $(LIBS)
+
+ $(LIBMAJOR): $(LIB)
+ rm -f $@
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/backend/Makefile.defs
++++ beignet-0.0.0+git2013.04.01+d1b234c/backend/Makefile.defs
+@@ -4,9 +4,9 @@ LOCAL_CFLAGS=-funroll-loops -Wstrict-ali
+
+ LOCAL_CXXFLAGS=$(LOCAL_CFLAGS) -std=c++0x -fno-rtti -Wno-invalid-offsetof
+
+-CXXFLAGS=$(LOCAL_CXXFLAGS) $(shell llvm-config --cxxflags | sed 's/\-pedantic//g')
++CXXFLAGS+=$(LOCAL_CXXFLAGS) $(shell llvm-config --cxxflags | sed 's/\-pedantic//g')
+
+-CFLAGS=$(LOCAL_CFLAGS) $(shell llvm-config --cflags) -std=gnu9x
++CFLAGS+=$(LOCAL_CFLAGS) $(shell llvm-config --cflags) -std=gnu9x
+
+ INC=$(shell for i in $(SUBDIRS); do ls $$i/*.h* 2>/dev/null; done)
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c49ca45
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,9 @@
+fix-clean
+path
+soname
+khronos
+verbose
+clang-from-path
+implement-gefa
+missing-header
+respect-flags
diff --git a/debian/patches/soname b/debian/patches/soname
new file mode 100644
index 0000000..500b082
--- /dev/null
+++ b/debian/patches/soname
@@ -0,0 +1,30 @@
+Description: Fix SONAMEs
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-01
+
+Index: beignet-0.0.0+git2013.04.01+d1b234c/Makefile.lib
+===================================================================
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/Makefile.lib 2013-03-31 04:38:20.000000000 +0200
++++ beignet-0.0.0+git2013.04.01+d1b234c/Makefile.lib 2013-03-31 04:39:45.666886644 +0200
+@@ -7,7 +7,7 @@
+ all: $(LIB) $(LIBMAJOR) $(LIBBASE)
+
+ $(LIB): $(OBJ) $(LIB_BACKEND)
+- $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJ) $(LIBS)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(LIBMAJOR) -o $@ $(OBJ) $(LIBS)
+
+ $(LIBMAJOR): $(LIB)
+ rm -f $@
+Index: beignet-0.0.0+git2013.04.01+d1b234c/backend/Makefile.lib
+===================================================================
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/backend/Makefile.lib 2013-03-31 04:42:47.946878517 +0200
++++ beignet-0.0.0+git2013.04.01+d1b234c/backend/Makefile.lib 2013-03-31 04:42:58.946878027 +0200
+@@ -9,7 +9,7 @@
+ all: $(LIB) $(LIBMAJOR) $(LIBBASE)
+
+ $(LIB): $(OBJ)
+- $(CXX) $(CXXFLAGS) -shared -o $@ $(OBJ) $(LIBS)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(LIBMAJOR) -o $@ $(OBJ) $(LIBS)
+
+ $(LIBMAJOR): $(LIB)
+ rm -f $@
diff --git a/debian/patches/verbose b/debian/patches/verbose
new file mode 100644
index 0000000..e615eb7
--- /dev/null
+++ b/debian/patches/verbose
@@ -0,0 +1,16 @@
+Description: More verbose errors
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-01
+
+Index: beignet-0.0.0+git2013.04.01+d1b234c/src/cl_utils.h
+===================================================================
+--- beignet-0.0.0+git2013.04.01+d1b234c.orig/src/cl_utils.h 2013-04-01 04:31:35.000000000 +0200
++++ beignet-0.0.0+git2013.04.01+d1b234c/src/cl_utils.h 2013-04-01 04:35:18.299046483 +0200
+@@ -80,6 +80,7 @@
+
+ #define FATAL(...) \
+ do { \
++ fprintf(stderr, "in function %s:\n", __FUNCTION__); \
+ fprintf(stderr, "error: "); \
+ fprintf(stderr, __VA_ARGS__); \
+ fprintf(stderr, "\n"); \
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..130e075
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --parallel
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-devel
mailing list