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

Implement phase one of the migration to group attributes #343

Merged
merged 6 commits into from
Jan 22, 2020

Conversation

Perksey
Copy link
Contributor

@Perksey Perksey commented Jan 8, 2020

Implements the new schema from #335 and deprecates the old one. That issue should be kept open until the Khronos Group decides to remove the old group blocks permenantly.

The enumerants have been tagged using an automated process. As such, the groups will have been preserved in this new format exactly as they were in the old format.

The RNC schema has also been updated.

@Perksey Perksey changed the title [WIP] Implement phase one of the migration to group attributes Implement phase one of the migration to group attributes Jan 8, 2020
@Perksey
Copy link
Contributor Author

Perksey commented Jan 8, 2020

This is ready for review.

Copy link
Collaborator

@oddhack oddhack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, double-checked this. The schema won't validate gl.xml both because the group tags were removed from the schema, and the group attribute is required but not present on all enum tags. I think it would be best to make the enum attribute optional as it's unlikely all of them will belong to a group - of course it could be forced but that could end up with a lot of verbosity and unused group names.

xml/registry.rnc Outdated Show resolved Hide resolved
@Perksey Perksey requested a review from oddhack January 10, 2020 18:47
@oddhack
Copy link
Collaborator

oddhack commented Jan 11, 2020

@pdaniell-nv I think this is OK to merge per #335, let me know when WG signs off. Also see #346.

@pdaniell-nv
Copy link
Contributor

I'll put this on the agenda for the next OpenGL/ES WG meeting January 22nd. If that is too far out let me know and I'll call an email vote.

@Perksey
Copy link
Contributor Author

Perksey commented Jan 14, 2020 via email

@pdaniell-nv
Copy link
Contributor

Approved to merge. Thanks for your patience.

@oddhack oddhack merged commit a771a80 into KhronosGroup:master Jan 22, 2020
svenpanne added a commit to haskell-opengl/OpenGLRaw that referenced this pull request Nov 14, 2021
The commit after that changes the schema, see:

   KhronosGroup/OpenGL-Registry#335
   KhronosGroup/OpenGL-Registry#343

To follow these changes, we will need to massage the registry processor
accordingly, but this will be done later.
oddhack added a commit that referenced this pull request May 11, 2022
This was inserted in #343, probably as an accidental side-effect of
someone's editor - it is not mentioned in the PR comments - and is
breaking some downstream scripts which consume the file.
@oddhack oddhack mentioned this pull request May 11, 2022
@oddhack
Copy link
Collaborator

oddhack commented May 11, 2022

@Perksey a stray BOM crept into gl.xml in this PR which the vk-gl-cts project just got affected by. Propose to pull it out in #506. I assume this was an accident as it's not mentioned anywhere in the comments above but in any event, the file is defined to be encoded in UTF-8. Probably the Python script should be tweaked to open the registry in UTF-8 mode, although it just contains ASCII.

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.

3 participants