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

[naga] Use cfg aliases to enable naga::back::continue_forward. #6064

Merged
merged 1 commit into from
Jul 31, 2024

Conversation

jimblandy
Copy link
Member

@jimblandy jimblandy commented Jul 30, 2024

Rather than feature = "blah", use the new cfg identifiers introduced by the cfg_aliases invocation in naga/build.rs to decide whether to compile the naga::back::continue_forward module, which is only used by the GLSL and HLSL backends.

The hlsl_out cfg identifer has a more complex condition than just feature = "hlsl-out", introduced by #5919.

Fixes #6063.

@jimblandy jimblandy added area: naga back-end Outputs of naga shader conversion naga Shader Translator lang: GLSL OpenGL Shading Language lang: HLSL D3D Shading Language labels Jul 30, 2024
@jimblandy jimblandy requested a review from a team as a code owner July 30, 2024 22:06
@jimblandy jimblandy force-pushed the naga-cfg-continue-forward branch from 76f9f07 to 6407ec6 Compare July 30, 2024 22:07
Copy link
Member

@ErichDonGubler ErichDonGubler left a comment

Choose a reason for hiding this comment

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

Só vai!

@jimblandy
Copy link
Member Author

Obrigado por dar uma olhada!

@jimblandy jimblandy force-pushed the naga-cfg-continue-forward branch from 6407ec6 to a72cae2 Compare July 31, 2024 03:13
Rather than `feature = "blah"`, use the new `cfg` identifiers
introduced by the `cfg_aliases` invocation in `naga/build.rs` to
decide whether to compile the `naga::back::continue_forward` module,
which is only used by the GLSL and HLSL backends.

The `hlsl_out` `cfg` identifer has a more complex condition than just
`feature = "hlsl-out"`, introduced by gfx-rs#5919.

Fixes gfx-rs#6063.
@jimblandy jimblandy force-pushed the naga-cfg-continue-forward branch from a72cae2 to 4403413 Compare July 31, 2024 03:14
@ErichDonGubler ErichDonGubler merged commit 7ff80d6 into gfx-rs:trunk Jul 31, 2024
25 checks passed
@jimblandy jimblandy deleted the naga-cfg-continue-forward branch July 31, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: naga back-end Outputs of naga shader conversion lang: GLSL OpenGL Shading Language lang: HLSL D3D Shading Language naga Shader Translator
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Naga fails to build: "unresolved import back::continue_forward"
3 participants