Skip to content

Commit 75035a7

Browse files
elebihantpetazzoni
authored andcommitted
sunxi-mali: add missing GLchar definitions.
The GLES and GLES2 header files provided by sunxi-mali do not define the type "GLchar" and use "char" instead in the prototype of some functions. In order to have some applications build (like cairo), a new patch has been added to define the missing type. This issue has been reported upstream some time ago, but the pull request has not been merged yet. (See linux-sunxi/sunxi-mali#8). Fixes http://autobuild.buildroot.net/results/2cb/2cb13a5bb92dabed219d49f49f0b9a2dfe65a0ca/. [Thomas: add more details to the patch description, using the commit log message details.] Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
1 parent 66c2132 commit 75035a7

1 file changed

Lines changed: 45 additions & 0 deletions

File tree

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
From 058d5e8cd90d117535b5d314fd9e15c70028ff20 Mon Sep 17 00:00:00 2001
2+
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
3+
Date: Mon, 21 Apr 2014 19:31:23 +0200
4+
Subject: [PATCH] Add missing GLchar definitions.
5+
6+
The GLES and GLES2 header files provided by sunxi-mali do not define the
7+
type "GLchar" and use "char" instead in the prototype of some functions.
8+
9+
This issue has been reported upstream some time ago, but the pull
10+
request has not been merged yet. (See
11+
https://github.com/linux-sunxi/sunxi-mali/pull/8).
12+
13+
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
14+
---
15+
include/GLES/gl.h | 1 +
16+
include/GLES2/gl2.h | 1 +
17+
2 files changed, 2 insertions(+)
18+
19+
diff --git a/include/GLES/gl.h b/include/GLES/gl.h
20+
index 858f394..a6bb591 100644
21+
--- a/include/GLES/gl.h
22+
+++ b/include/GLES/gl.h
23+
@@ -29,6 +29,7 @@ typedef float GLfloat;
24+
typedef float GLclampf;
25+
typedef signed int GLfixed;
26+
typedef signed int GLclampx;
27+
+typedef char GLchar;
28+
29+
typedef int * GLintptr;
30+
typedef int * GLsizeiptr;
31+
diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h
32+
index 59e376c..90d96bb 100644
33+
--- a/include/GLES2/gl2.h
34+
+++ b/include/GLES2/gl2.h
35+
@@ -32,6 +32,7 @@ typedef unsigned int GLuint;
36+
typedef khronos_float_t GLfloat;
37+
typedef khronos_float_t GLclampf;
38+
typedef khronos_int32_t GLfixed;
39+
+typedef char GLchar;
40+
41+
/* GL types for handling large vertex buffer objects */
42+
typedef khronos_intptr_t GLintptr;
43+
--
44+
1.9.0
45+

0 commit comments

Comments
 (0)