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

Update generated headers and remove CL/GL types from cl_platform.h #257

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

kpet
Copy link
Contributor

@kpet kpet commented Jul 10, 2024

  • Move CL/GL type declarations from cl_platform.h to cl_gl.h
  • Include version macros for extensions

Signed-off-by: Kevin Petit [email protected]

Copy link
Contributor

@bashbaug bashbaug left a comment

Choose a reason for hiding this comment

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

I'm OK with this and I think it's the right thing to do, but cl_gl.h is currently generated, so if we merge this as-is we'll need to be careful not to overwrite this change next time we re-generate headers.

If possible, I think it would be preferable to:

  1. Make this change to cl.xml first, either as part of #960 or separately, if it'll take some time for #960 to land.
  2. Regenerate headers with the updated XML file to update cl_gl.h.

Would this be OK? I'll happily review and merge a PR for (1) as soon as it's ready. Thanks!

- Move CL/GL type declarations from cl_platform.h to cl_gl.h
- Include version macros for extensions

Signed-off-by: Kevin Petit <[email protected]>
@kpet kpet changed the title Move CL/GL type declarations from cl_platform.h to cl_gl.h Update generated headers and remove CL/GL types from cl_platform.h Jul 11, 2024
@kpet
Copy link
Contributor Author

kpet commented Jul 11, 2024

Oh yes, you're right. The few seconds I spent observing the absence of a mako template for cl_gl.h were not enough!

I've created a PR (KhronosGroup/OpenCL-Docs#1210) separate from KhronosGroup/OpenCL-Docs#960 (that I agree will likely require a bit more discussion) and repurposed this one to update the generated headers and manually remove the types from cl_platform.h.

@bashbaug
Copy link
Contributor

I think this should be fairly non-contentious, so I'm going to go ahead and merge this offline.

@bashbaug bashbaug merged commit d79beab into KhronosGroup:main Jul 11, 2024
77 checks passed
@kpet kpet deleted the clgl-types branch October 11, 2024 13:49
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.

2 participants