[beignet] 04/07: Move cl_intel_accelerator to cl_intel.h to fix FTBFS with system cl_ext.h
Rebecca Palmer
rnpalmer-guest at moszumanska.debian.org
Tue Sep 6 21:32:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
rnpalmer-guest pushed a commit to branch master
in repository beignet.
commit 90877616d4d1057566d55c47a1556ae81376bacb
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date: Mon Sep 5 20:18:33 2016 +0100
Move cl_intel_accelerator to cl_intel.h to fix FTBFS with
system cl_ext.h
---
debian/changelog | 2 +
debian/patches/cl_accelerator_intel.patch | 145 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 148 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 56498b7..465bdd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ beignet (1.2.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop patches applied upstream, refresh others.
+ * Move cl_intel_accelerator to cl_intel.h to fix FTBFS with
+ system cl_ext.h.
-- Rebecca N. Palmer <rebecca_palmer at zoho.com> Sun, 04 Sep 2016 20:53:34 +0100
diff --git a/debian/patches/cl_accelerator_intel.patch b/debian/patches/cl_accelerator_intel.patch
new file mode 100644
index 0000000..847b27a
--- /dev/null
+++ b/debian/patches/cl_accelerator_intel.patch
@@ -0,0 +1,145 @@
+Description: Move cl_intel_accelerator to cl_intel.h
+
+This extension is not yet in Khronos cl_ext.h (Debian opencl-headers),
+and beignet FTBFS without it.
+
+The enclosing #if should allow this to also be used with newer
+cl_ext.h that does have it, but this has not been tested.
+
+Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
+Forwarded: not-needed
+
+--- beignet-1.2.0.orig/include/CL/cl_intel.h
++++ beignet-1.2.0/include/CL/cl_intel.h
+@@ -26,6 +26,111 @@
+ extern "C" {
+ #endif
+
++#if defined(__CL_EXT_H) && !defined(cl_intel_accelerator)
++/*********************************
++* cl_intel_accelerator extension *
++*********************************/
++#define cl_intel_accelerator 1
++#define cl_intel_motion_estimation 1
++
++typedef struct _cl_accelerator_intel* cl_accelerator_intel;
++typedef cl_uint cl_accelerator_type_intel;
++typedef cl_uint cl_accelerator_info_intel;
++
++typedef struct _cl_motion_estimation_desc_intel {
++ cl_uint mb_block_type;
++ cl_uint subpixel_mode;
++ cl_uint sad_adjust_mode;
++ cl_uint search_path_type;
++} cl_motion_estimation_desc_intel;
++
++/* Error Codes */
++#define CL_INVALID_ACCELERATOR_INTEL -1094
++#define CL_INVALID_ACCELERATOR_TYPE_INTEL -1095
++#define CL_INVALID_ACCELERATOR_DESCRIPTOR_INTEL -1096
++#define CL_ACCELERATOR_TYPE_NOT_SUPPORTED_INTEL -1097
++
++/* Deprecated Error Codes */
++#define CL_INVALID_ACCELERATOR_INTEL_DEPRECATED -6000
++#define CL_INVALID_ACCELERATOR_TYPE_INTEL_DEPRECATED -6001
++#define CL_INVALID_ACCELERATOR_DESCRIPTOR_INTEL_DEPRECATED -6002
++#define CL_ACCELERATOR_TYPE_NOT_SUPPORTED_INTEL_DEPRECATED -6003
++
++/* cl_accelerator_type_intel */
++#define CL_ACCELERATOR_TYPE_MOTION_ESTIMATION_INTEL 0x0
++
++/* cl_accelerator_info_intel */
++#define CL_ACCELERATOR_DESCRIPTOR_INTEL 0x4090
++#define CL_ACCELERATOR_REFERENCE_COUNT_INTEL 0x4091
++#define CL_ACCELERATOR_CONTEXT_INTEL 0x4092
++#define CL_ACCELERATOR_TYPE_INTEL 0x4093
++
++/*cl_motion_detect_desc_intel flags */
++#define CL_ME_MB_TYPE_16x16_INTEL 0x0
++#define CL_ME_MB_TYPE_8x8_INTEL 0x1
++#define CL_ME_MB_TYPE_4x4_INTEL 0x2
++
++#define CL_ME_SUBPIXEL_MODE_INTEGER_INTEL 0x0
++#define CL_ME_SUBPIXEL_MODE_HPEL_INTEL 0x1
++#define CL_ME_SUBPIXEL_MODE_QPEL_INTEL 0x2
++
++#define CL_ME_SAD_ADJUST_MODE_NONE_INTEL 0x0
++#define CL_ME_SAD_ADJUST_MODE_HAAR_INTEL 0x1
++
++#define CL_ME_SEARCH_PATH_RADIUS_2_2_INTEL 0x0
++#define CL_ME_SEARCH_PATH_RADIUS_4_4_INTEL 0x1
++#define CL_ME_SEARCH_PATH_RADIUS_16_12_INTEL 0x5
++
++extern CL_API_ENTRY cl_accelerator_intel CL_API_CALL
++clCreateAcceleratorINTEL(
++ cl_context /* context */,
++ cl_accelerator_type_intel /* accelerator_type */,
++ size_t /* descriptor_size */,
++ const void* /* descriptor */,
++ cl_int* /* errcode_ret */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++typedef CL_API_ENTRY cl_accelerator_intel
++ (CL_API_CALL *clCreateAcceleratorINTEL_fn)(
++ cl_context /* context */,
++ cl_accelerator_type_intel /* accelerator_type */,
++ size_t /* descriptor_size */,
++ const void* /* descriptor */,
++ cl_int* /* errcode_ret */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++extern CL_API_ENTRY cl_int CL_API_CALL
++clGetAcceleratorInfoINTEL
++(
++ cl_accelerator_intel /* accelerator */,
++ cl_accelerator_info_intel /* param_name */,
++ size_t /* param_value_size */,
++ void* /* param_value */,
++ size_t* /* param_value_size_ret */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++typedef CL_API_ENTRY cl_int
++ (CL_API_CALL *clGetAcceleratorInfoINTEL_fn)(
++ cl_accelerator_intel /* accelerator */,
++ cl_accelerator_info_intel /* param_name */,
++ size_t /* param_value_size */,
++ void* /* param_value */,
++ size_t* /* param_value_size_ret */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++extern CL_API_ENTRY cl_int CL_API_CALL
++clRetainAcceleratorINTEL(
++ cl_accelerator_intel /* accelerator */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++typedef CL_API_ENTRY cl_int
++ (CL_API_CALL *clRetainAcceleratorINTEL_fn)(
++ cl_accelerator_intel /* accelerator */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++extern CL_API_ENTRY cl_int CL_API_CALL
++clReleaseAcceleratorINTEL(
++ cl_accelerator_intel /* accelerator */ ) CL_EXT_SUFFIX__VERSION_1_2;
++
++typedef CL_API_ENTRY cl_int
++ (CL_API_CALL *clReleaseAcceleratorINTEL_fn)(
++ cl_accelerator_intel /* accelerator */ ) CL_EXT_SUFFIX__VERSION_1_2;
++#endif
++
+ #define CL_MEM_PINNABLE (1 << 10)
+
+ /* Track allocations and report current number of unfreed allocations */
+--- beignet-1.2.0.orig/src/cl_accelerator_intel.h
++++ beignet-1.2.0/src/cl_accelerator_intel.h
+@@ -3,6 +3,7 @@
+
+ #include "CL/cl.h"
+ #include "CL/cl_ext.h"
++#include "CL/cl_intel.h"
+ #include <stdint.h>
+
+ struct _cl_accelerator_intel {
+--- beignet-1.2.0.orig/src/cl_driver.h
++++ beignet-1.2.0/src/cl_driver.h
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include "cl_driver_type.h"
+ #include "CL/cl_ext.h"
++#include "CL/cl_intel.h"
+ /* Various limitations we should remove actually */
+ #define GEN_MAX_SURFACES 256
+ #define GEN_MAX_SAMPLERS 16
diff --git a/debian/patches/series b/debian/patches/series
index ae6269c..6a4ee9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ allow-+-in-directory.patch
Enable-test-debug.patch
find-python35.patch
docs-broken-links.patch
+cl_accelerator_intel.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-commits
mailing list