fix conflicting data types between GLES2/gl2.h and GLES/gl.h#19
Open
RomainNaour wants to merge 1 commit intolinux-sunxi:masterfrom
Open
Conversation
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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