NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/sunxi-mali: fix conflicting data types between GLES2/gl2.h and GLES/gl.h

Browse Source 
When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the
build fail since GLintptr and GLsizeiptr data type are not the same in
GLES2/gl2.h and GLES/gl.h.

Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and
GLfixed.

Fixes:
http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Romain Naour 2017-06-05 17:45:18 +02:00 committed by Thomas Petazzoni
parent a52896f755
commit 4688667bc8
1 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch Normal file
View File

@ -0,0 +1,57 @@
From 5bf4d4f9c759fdb3c0db61a781042223236169c6 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Mon, 5 Jun 2017 12:40:16 +0200
Subject: [PATCH] fix conflicting data types between GLES2/gl2.h and GLES/gl.h
When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the
build fail since GLintptr and GLsizeiptr data type are not the same in
GLES2/gl2.h and GLES/gl.h.
Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and
GLfixed.
Fixes:
http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
include/GLES/gl.h | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/GLES/gl.h b/include/GLES/gl.h
index a6bb591..799408b 100644
--- a/include/GLES/gl.h
+++ b/include/GLES/gl.h
@@ -18,22 +18,21 @@ typedef void GLvoid;
typedef unsigned int GLenum;
typedef unsigned char GLboolean;
typedef unsigned int GLbitfield;
-typedef signed char GLbyte;
+typedef khronos_int8_t GLbyte;
typedef short GLshort;
typedef int GLint;
typedef int GLsizei;
-typedef unsigned char GLubyte;
+typedef khronos_uint8_t GLubyte;
typedef unsigned short GLushort;
typedef unsigned int GLuint;
-typedef float GLfloat;
-typedef float GLclampf;
-typedef signed int GLfixed;
+typedef khronos_float_t GLfloat;
+typedef khronos_float_t GLclampf;
+typedef khronos_int32_t GLfixed;
typedef signed int GLclampx;
typedef char GLchar;
-typedef int * GLintptr;
-typedef int * GLsizeiptr;
-
+typedef khronos_intptr_t GLintptr;
+typedef khronos_ssize_t GLsizeiptr;
/*************************************************************/
--
2.9.4