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

Regenerate with final KHR Ray Tracing spec #174

Merged
merged 11 commits into from
Dec 30, 2020
Merged

Conversation

MarijnS95
Copy link
Collaborator

Depends on #173

The ray tracing specification is final 🎉 ! See https://www.khronos.org/blog/vulkan-ray-tracing-final-specification-release for more details.

We should hold off merging and releasing this until SPIRV-Headers drops the next tag so that we can version the spirv_headers crate properly.

@MarijnS95
Copy link
Collaborator Author

MarijnS95 commented Dec 9, 2020

Turned TerminateRayKHR/IgnoreIntersectionKHR into terminals (see microsoft/DirectXShaderCompiler#3285, microsoft/DirectXShaderCompiler#3295, KhronosGroup/SPIRV-Tools#4050). Note that rspirv doesn't yet make the distinction between block terminals and execution terminators (these instructions + Kill + TerminateInvocation), is that something worth looking into? EDIT: Not interesting, these instructions still terminate a block and I don't see any special handling for returns and aborts either.

Also removed the Terminator class. In particular because it's not possible to write Some(Terminator) | (Some(Reserved) if ...) in a match block, but this class has never existed in the history of SPIRV-Headers. Bit misleading to keep it in until it actually shows up, right?

Finally, the version: Looks like we have 1.5.4, 1.5.4.raytracing and 1.5.4.raytracing.fixed... We can't represent that in semver and I have no idea if another proper version number bump is going to happen to land the RT spec (here's hoping these are "prerelease" indicators...).

@MarijnS95 MarijnS95 marked this pull request as ready for review December 14, 2020 14:23
@Jasper-Bekkers Jasper-Bekkers merged commit b5ffcdb into gfx-rs:master Dec 30, 2020
@MarijnS95 MarijnS95 deleted the v11 branch December 30, 2020 20:02
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