Allow unconsumed inputs in fragment shaders #5531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Imberflur
force-pushed
the
allow-unconsumed-inputs
branch
2 times, most recently
from
1ed945e
to
f226525
Compare
Imberflur
commented
Apr 14, 2024
Imberflur
force-pushed
the
allow-unconsumed-inputs
branch
2 times, most recently
from
c3caa2d
to
0a04bf3
Compare
|
Great to see work here! Marking un-draft so it gets added to the review queue |
cwfitzgerald
approved these changes
Apr 17, 2024
Imberflur
force-pushed
the
allow-unconsumed-inputs
branch
3 times, most recently
from
9ae8bb7
to
3f11d08
Compare
Imberflur
force-pushed
the
allow-unconsumed-inputs
branch
2 times, most recently
from
03f0bba
to
de5faaf
Compare
cwfitzgerald
approved these changes
May 9, 2024
teoxoy
approved these changes
Jun 24, 2024
|
@Imberflur could you rebase the PR? |
outputs when generating HLSL. Fixes gfx-rs#3748 * Add naga::back::hlsl::FragmentEntryPoint for providing information about the fragment entry point when generating vertex entry points via naga::back::hlsl::Writer::write. Vertex outputs not consumed by the fragment entry point are omitted in the final output struct. * Add naga snapshot test for this new feature, * Remove Features::SHADER_UNUSED_VERTEX_OUTPUT, StageError::InputNotConsumed, and associated validation logic. * Make wgpu dx12 backend pass fragment shader info when generating vertex HLSL. * Add wgpu regression test for allowing unconsumed inputs.
* Add note that nesting structs for the inter-stage interface can't happen. * Remove new TODO notes (some addressed and some transferred to an issue gfx-rs#5577) * Changed issue that regression test refers to 3748 -> 5553 * Add debug_assert that binding.is_some() in hlsl writer * Fix typos caught in CI Also, fix compiling snapshot test when hlsl-out feature is not enabled.
Imberflur
force-pushed
the
allow-unconsumed-inputs
branch
from
de5faaf
to
2acc943
Compare
|
@teoxoy rebased! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By removing them from vertex outputs when generating HLSL.
naga::back::hlsl::FragmentEntryPointfor providing information about the fragment entry point when generating vertex entry points vianaga::back::hlsl::Writer::write. Vertex outputs not consumed by the fragment entry point are omitted in the final output struct.nagasnapshot test for this new feature,Features::SHADER_UNUSED_VERTEX_OUTPUT,StageError::InputNotConsumed, and associated validation logic.Connections
Fixes #3748
Description
My case affected by this is passing in SPIRV from
shadercwhich can optimize out unused inputs from the fragment shader. The shaders are dynamically configured with a pre-processor based on various settings from the user so it can be hard to predict when certain inter-stage variables are unused, and my attempt at configuring out particular outputs from vertex shaders quickly became overly verbose.As noted in the linked issue, this validation was originally in the WebGPU spec but was removed. The validation was necessary for generating HLSL with matching inter-stage interfaces but we can work around that by adjusting the HLSL generation to account for any unconsumed inputs.
After investigating this I found two potential ways to account for this in the generated HLSL:
I went with the second option since it seemed simpler to implement than generating new fields and nicely removed unnecessary work passing unused values (although I assume drivers can probably optimize this out).
Note: This is a breaking change.
Testing
I added a test to for whether the wgpu validation logic now allows unconsumed inputs and a naga snapshot test for removing the unconsumed vertex outputs when generating HLSL.
I have not tested on a windows machine with the dx12 backend!So here are some testing TODOs:cargo xtask teston machine with dx12.Checklist
cargo fmt.cargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.