[naga] Support local const in ImageSample.offset #7213
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
sagudev
added a commit
to sagudev/servo
that referenced
this pull request
Feb 25, 2025
Signed-off-by: sagudev <[email protected]>
sagudev
added a commit
to sagudev/servo
that referenced
this pull request
Feb 25, 2025
{"fail_fast": false, "matrix": [{"name": "Linux (Production, WPT)", "workflow": "linux", "wpt_layout": "2020", "profile": "production", "unit_tests": false, "build_libservo": false, "bencher": false, "wpt_args": "_webgpu"}]}
sagudev
force-pushed
the
local-const-img-sample
branch
from
eedefed to
2c8a3fc
Compare
This comment was marked as outdated.
This comment was marked as outdated.
sagudev
force-pushed
the
local-const-img-sample
branch
3 times, most recently
from
8428b4b to
7f1b037
Compare
This was referenced Feb 26, 2025
|
I need to recheck but I think https://github.com/sagudev/wgpu/blob/f011b1b1fba352897397e762cdc04123522e11ae/naga/src/lib.rs#L2206 is obsolete too. |
teoxoy
reviewed
Mar 6, 2025
sagudev
force-pushed
the
local-const-img-sample
branch
from
f011b1b to
4f9fb8d
Compare
Signed-off-by: sagudev <[email protected]>
Signed-off-by: sagudev <[email protected]>
Signed-off-by: sagudev <[email protected]>
Signed-off-by: sagudev <[email protected]>
Signed-off-by: sagudev <[email protected]>
sagudev
force-pushed
the
local-const-img-sample
branch
from
4f9fb8d to
0bf1098
Compare
|
I updated docs and rebased, so this should be ready to land. |
6 tasks
|
This seemed to regress one of our late-running tests, parsing the dota2 shaders: https://github.com/gfx-rs/wgpu/blob/trunk/.github/workflows/lazy.yml#L16-L40 |
Yeah, I noticed this before. Fix is already done in #7297 |
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.
Connections
Continuation of #6935, fixes #7230.
Description
ImageSample.offset was assumed to be global const everywhere, so this PR changes the requirement to be an expr that is also local, this required fixing all parts of naga ir (compaction,validation,analyzer); wgsl-in to accept local const and all backends to support writing const expr that come from function expr arena (instead of global expr arena).
This PR needs to be squashed, commits are separated only for easier review.
Testing
CTS run in servo: https://github.com/sagudev/servo/actions/runs/13517257103/job/37775703718 is good and changed existing test.
Checklist
cargo fmt.taplo format.cargo clippy. If applicable, add:--target wasm32-unknown-unknowncargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.