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

No longer require the workaround for the collatz example #778

Merged
merged 3 commits into from
Dec 2, 2021

Conversation

DJMcNab
Copy link
Contributor

@DJMcNab DJMcNab commented Oct 27, 2021

Follow up from #776, which works exactly as required <3

@DJMcNab
Copy link
Contributor Author

DJMcNab commented Oct 27, 2021

Ah, I hadn't updated my version of rust-analyzer. That'd be why format on save wasn't working.

@DJMcNab
Copy link
Contributor Author

DJMcNab commented Oct 27, 2021

Ok, so removing the Int8 capability currently fails in:

8 if !cx.builder.has_capability(Capability::Int8) => cx
.zombie_even_in_user_code(result, def_span, "u8 without OpCapability Int8"),

Which is approximately expected. However, since #667, simply commenting out that error allows valid spir-v to be built which doesn't require that capability. I'm not sure what the approach should be with transiently required capabilities.

@DJMcNab DJMcNab marked this pull request as ready for review October 27, 2021 20:20
@khyperia
Copy link
Contributor

khyperia commented Dec 1, 2021

Now that #809 is in, could you rebase to main and remove the Int8 cap?

build_shader("../../../shaders/sky-shader", true, &[])?;
build_shader("../../../shaders/simplest-shader", false, &[])?;
build_shader("../../../shaders/sky-shader", true)?;
build_shader("../../../shaders/simplest-shader", false)?;
// We need the int8 capability for using `Option`
Copy link
Contributor

Choose a reason for hiding this comment

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

please remove this comment~

@khyperia khyperia enabled auto-merge (squash) December 2, 2021 09:32
Copy link
Contributor

@khyperia khyperia left a comment

Choose a reason for hiding this comment

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

thanks!

@khyperia khyperia merged commit 0652153 into EmbarkStudios:main Dec 2, 2021
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