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

Fix shader argument buffer padding and atomics. #2231

Merged
merged 1 commit into from
May 7, 2024

Conversation

billhollings
Copy link
Contributor

@billhollings billhollings commented May 6, 2024

  • Pull in SPIRV-Cross fix for argument buffer padding.
  • Only use MTLTextureUsageShaderAtomic if native atomics are supported on the platform.

Fixes issues #2216 and #2180.

Copy link
Collaborator

@cdavis5e cdavis5e left a comment

Choose a reason for hiding this comment

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

Dunno why you asked for my review here, and not on the SPIRV-Cross change, since all this does is pull in an updated version of SPIRV-Cross... but, whatever.

@cdavis5e
Copy link
Collaborator

cdavis5e commented May 6, 2024

For the record, the SPIRV-Cross change looks good, too.

@billhollings
Copy link
Contributor Author

Dunno why you asked for my review here, and not on the SPIRV-Cross change, since all this does is pull in an updated version of SPIRV-Cross... but, whatever.

Normally I would.

With the SDK release coming up, it was a bit of a rush to get everything sorted out. So to expedite, I thought I'd get the SPRIV-Cross MoltenVK branch set up, and populated here, so they could be reviewed together. If it didn't work out, I could then just delete the SPIRV-Cross branch.

All part of my master plan! 😂

@billhollings billhollings changed the title Fix argument buffer padding on shader conversion. Fix shader argument buffer padding and atomics. May 7, 2024
@billhollings
Copy link
Contributor Author

I've updated this to include the fix for the atomic issue in #2216, and to use the new commit hash from the main branch in SPIRV-Cross.

- Pull in SPIRV-Cross fix for argument buffer padding.
- Only use MTLTextureUsageShaderAtomic if native atomics
  are supported on the platform.
@billhollings billhollings merged commit bf097ed into KhronosGroup:main May 7, 2024
6 checks passed
@billhollings billhollings deleted the fix-arg-buff-padding branch May 7, 2024 03:04
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