New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conflicting type declarations in GL and GLES #183

Merged
merged 2 commits into from May 25, 2018

Conversation

Projects
None yet
2 participants
@c0d1f1ed
Contributor

c0d1f1ed commented May 24, 2018

Fix conflicting type declarations in GL and GLES.

Fixes #162
Fixes #97

c0d1f1ed added some commits Mar 28, 2018

Regenerate headers.
Result of running 'make' in the xml/ directory on Linux.

Fixes #162
Fixes #97

@oddhack oddhack merged commit 88221fd into KhronosGroup:master May 25, 2018

hubot pushed a commit to google/swiftshader that referenced this pull request May 30, 2018

Use official headers to define GL_ARB_texture_rectangle.
Fixing KhronosGroup/OpenGL-Registry#149 and
KhronosGroup/OpenGL-Registry#183 enabled
including desktop OpenGL headers without conflicts, so we no longer
have to define enums for ARB extensions ourselves.

Change-Id: I4f2e2d3b79a6f5cacf53f2a8ace78b6d124cb5d1
Reviewed-on: https://swiftshader-review.googlesource.com/19029
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

crosire added a commit to crosire/gl3w that referenced this pull request May 31, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment