Skip to content
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

Create missing enumerations #45

Merged
merged 1 commit into from
Apr 24, 2017
Merged

Create missing enumerations #45

merged 1 commit into from
Apr 24, 2017

Conversation

frabert
Copy link
Contributor

@frabert frabert commented Apr 17, 2017

This pull request fills several missing enumerations

@frabert
Copy link
Contributor Author

frabert commented Apr 17, 2017

I am planning to add more as I have just finished writing a tool to discover missing groups

@oddhack
Copy link
Contributor

oddhack commented Apr 18, 2017

When you're done with this, please squash it down to a single commit. All looks fine so far.

@frabert
Copy link
Contributor Author

frabert commented Apr 18, 2017

@oddhack So I should close this PR when I'm done and re-open a new one containing a single commit?

@oddhack
Copy link
Contributor

oddhack commented Apr 18, 2017

You can (if your git-fu is advanced enough) squash the commits in your local copy of the branch and force-push it to github, but your approach works too.

@frabert
Copy link
Contributor Author

frabert commented Apr 19, 2017

This is done. I will now try and squash the thing before it starts laying eggs.

@frabert
Copy link
Contributor Author

frabert commented Apr 19, 2017

@oddhack Done.

@oddhack oddhack merged commit 3e9b306 into KhronosGroup:master Apr 24, 2017
oddhack added a commit that referenced this pull request Apr 24, 2017
add enum group information, it changed some parameter names and
types incorrectly.

Fixes #46.
oddhack added a commit that referenced this pull request Apr 24, 2017
@oddhack
Copy link
Contributor

oddhack commented Apr 24, 2017

Please see #46 / #47 and resubmit just the part of this changing the enum groups and adding group= tags to param tags. None of the group changes should have an effect on the generated headers.

@frabert
Copy link
Contributor Author

frabert commented Apr 24, 2017

@oddhack Ok, sorry for messing this up, I am trying to re-do this the right way now. Am I allowed to add group annotations for GLenum return types?

Like so:

         <command>
-            <proto><ptype>GLenum</ptype> <name>glClientWaitSync</name></proto>
+            <proto group="SyncStatus"><ptype>GLenum</ptype> <name>glClientWaitSync</name></proto>
             <param group="sync"><ptype>GLsync</ptype> <name>sync</name></param>
             <param><ptype>GLbitfield</ptype> <name>flags</name></param>
             <param><ptype>GLuint64</ptype> <name>timeout</name></param>
         </command>

@oddhack
Copy link
Contributor

oddhack commented Apr 25, 2017

That's fine. It's the actual API - e.g. the resulting headers - that we don't want to change without more careful attention.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants