Fix conflicting type declarations in GL and GLES #183
Merged
Conversation
hubot
pushed a commit
to google/swiftshader
that referenced
this pull request
May 30, 2018
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
…al header "KHR/khrplatform.h" This was introduced in KhronosGroup/OpenGL-Registry#183
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.
Fix conflicting type declarations in GL and GLES.
Fixes #162
Fixes #97