Skip to content

Add multiview limits and tests#8206

Merged
Wumpf merged 109 commits intogfx-rs:trunkfrom
inner-daemons:multiview-tests-limits
Nov 1, 2025
Merged

Add multiview limits and tests#8206
Wumpf merged 109 commits intogfx-rs:trunkfrom
inner-daemons:multiview-tests-limits

Conversation

@inner-daemons
Copy link
Collaborator

@inner-daemons inner-daemons commented Sep 10, 2025 •
edited
Loading

Connections
Closes #7196
Closes #8138

Description
Adds new limits and testing for multiview, add support for more backends (also in naga), add new multiview bitmask renderpass descriptor field for selecting which layers to render to in a single pass.

Testing
There are tests

Squash or Rebase?
Squash

Checklist

  • Run cargo fmt.
  • Run taplo format.
  • Run cargo clippy --tests. If applicable, add:
    • --target wasm32-unknown-unknown
  • Run cargo xtask test to run tests.
  • If this contains user-facing changes, add a CHANGELOG.md entry.

@inner-daemons inner-daemons marked this pull request as ready for review September 10, 2025 20:10
@inner-daemons inner-daemons marked this pull request as draft September 11, 2025 18:38
@inner-daemons inner-daemons requested review from cwfitzgerald and removed request for cwfitzgerald September 11, 2025 18:38
@inner-daemons
Copy link
Collaborator Author

inner-daemons commented Sep 12, 2025 •
edited
Loading

@cwfitzgerald I left a comment about this in matrix but it got hidden by newer messages. Is it a bad idea to add another multi view related field to a render pass descriptor? This might be a topic worth bringing up in a meeting, I'm not sure. I'm just hesitant to assume that's fine because if I'm wrong then I will have refactored every use of render passes in this entire repo :)

Not urgent of course

EDIT: This has been answered

@inner-daemons inner-daemons mentioned this pull request Sep 15, 2025
Merged
8 tasks
@inner-daemons
Copy link
Collaborator Author

inner-daemons commented Oct 26, 2025

@Wumpf Thanks for the review! This this incredibly comprehensive and useful. I'll probably just rewrite major parts of the test/example, since that seems to be the weakest part.

Wumpf
Wumpf requested changes Oct 28, 2025
View reviewed changes
Copy link
Member

@Wumpf Wumpf left a comment •
edited
Loading

Choose a reason for hiding this comment

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

thanks for following up on everything! example & test looks a lot nicer now :)
However, I believe you made a mistake and accidentally made the non-continguous mask-test continguous

But I think after that we're done! :)

@inner-daemons
Copy link
Collaborator Author

inner-daemons commented Oct 28, 2025

@Wumpf Great, thanks! Should be good to go soon then

@inner-daemons
Copy link
Collaborator Author

inner-daemons commented Oct 30, 2025

Feature detection is currently broken, gonna look that over and unbreak this bad diff resolution. Then it should be pretty good

@Wumpf Wumpf self-requested a review November 1, 2025 11:57
Wumpf
Wumpf approved these changes Nov 1, 2025
View reviewed changes
Copy link
Member

@Wumpf Wumpf left a comment

Choose a reason for hiding this comment

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

thanks for bearing with the long delays!
🚢

@Wumpf Wumpf enabled auto-merge (squash) November 1, 2025 12:00
@Wumpf Wumpf merged commit ad0f311 into gfx-rs:trunk Nov 1, 2025
41 checks passed
@inner-daemons
Copy link
Collaborator Author

inner-daemons commented Nov 1, 2025

@Wumpf Thanks for merging this! I'm not sure if I actually fixed the feature detection before this got pulled in, if not, I'll do that in a subsequent PR. Just a very similar issue to the barycentrics PR where I don't check for the proper OS version before calling a function to detect the feature.

@inner-daemons inner-daemons mentioned this pull request Nov 8, 2025
Merged
6 tasks
@ChristopherBiscardi ChristopherBiscardi mentioned this pull request Dec 25, 2025
Merged
2 tasks
github-merge-queue bot pushed a commit to bevyengine/bevy that referenced this pull request Jan 22, 2026
@ChristopherBiscardi @robtfm
Upgrade to wgpu 28 (#22265)
543b305 
Upgrade to wgpu 28

> [!important]
> This can't merge until bevyengine/naga_oil#132
does, and the dependency is updated from my fork to the release.
> 
> Also requires wgpu 28 in dlss_wgpu:
bevyengine/dlss_wgpu#17

> [!note]
> This does not enable mesh shaders, and neither does the naga_oil PR. I
chose to do an upgrade first, then go back and see about mesh shaders.

Here's a general list of changes and what I did. Commits are grouped by
feature except for the last one, which enabled solari when I ran the
solari example.

## MipmapFilterMode is split from FilterMode

- Split MipmapFilterMode from FilterMode #8314:
gfx-rs/wgpu#8314

solution: implement From for `MipmapFilterMode`/`ImageFilterMode` since
the values are the same. The split was because the spec indicates they
are different types, even though they have the same values.

## Push Constants are now Immediates

- gfx-rs/wgpu#8724

immediate_size is [a
u32](https://docs.rs/wgpu/28.0.0/wgpu/struct.PipelineLayoutDescriptor.html#structfield.immediate_size)
so use that instead of `PushConstantRange`

## Capabilities name changes

- gfx-rs/wgpu#8671

Got new list from
https://github.com/gfx-rs/wgpu/blob/trunk/wgpu-core/src/device/mod.rs#L449
and copied it in.

## subgroup_{min,max}_size moved from Limits to AdapterInfo

- gfx-rs/wgpu#8609

Update the limits to have the fields they have now, mirror the logic
from the other limits calls.

## multiview_mask

- gfx-rs/wgpu#8206

set to None because we don't use it currently. Its vaguely for VR.

## error scope is now a guard

- gfx-rs/wgpu#8685

retain guard and then pop() it later


---

I made one mistake during the PR, thinking set_immediates was going to
be the size of the immediates and not the offset. I'd like reviewers to
take a look at immediates offset and size sites specifically just in
case I missed something.

Here's a bunch of examples running

<img width="1470" height="1040" alt="screenshot-2025-12-24-at-16 47
22@2x"
src="https://github.com/user-attachments/assets/83dcf4c8-69f5-480a-b724-86598530f25a"
/>
<img width="1470" height="1040" alt="screenshot-2025-12-24-at-16 48
44@2x"
src="https://github.com/user-attachments/assets/46d897fa-1ab2-44ef-8055-fe2fce740dbc"
/>
<img width="1470" height="1040" alt="screenshot-2025-12-24-at-16 49
10@2x"
src="https://github.com/user-attachments/assets/6ae7a9bf-0473-4800-8dfc-233a6a41d6df"
/>
<img width="1470" height="1040" alt="screenshot-2025-12-24-at-16 49
31@2x"
src="https://github.com/user-attachments/assets/89f84a26-cfbd-4196-bca8-111c3d20ba7b"
/>


## Known Issues

> [!NOTE]
> 
> There are no current known issues. Everything previous has been
solved.

- [x] enable extensions can not be written in naga oil in a way that
allows them to be used in composed modules.

Update: this was fixed by introducing a flag in naga-oil to force
shaders to allow ray queries in composed modules when using bevy_solari.
This is temporary and will be different in WESL-future.

<details><summary>old explanation</summary>
This is blocking solari from working on nvidia (solari runs successfully
on macos m1) because it needs `enable wgpu_ray_query;`. Putting the
declaration before `#define_import_path` means it gets stripped out
(afaict), and putting it after results in

```
error: expected global declaration, but found a global directive
  ┌─ embedded://bevy_solari/scene/raytracing_scene_bindings.wgsl:3:1
  │
3 │ enable wgpu_ray_query;
  │ ^^^^^^ written after first global declaration
  │
  = expected global declaration, but found a global directive
```

</details>

- [x] dlss_wgpu mixes apis which [causes panics
now](bevyengine/dlss_wgpu#17 (comment)).

<details><summary>Previous notes as dlss_wgpu was being fixed
here</summary>

The wgpu release notes don't mention which PR this was introduced in,
only saying:

> Using both the wgpu command encoding APIs and
CommandEncoder::as_hal_mut on the same encoder will now result in a
panic.

It was caused by gfx-rs/wgpu#8373 which claimed
to not know of any use cases

> With record on finish, the actual ordering on the command buffer is
deeply counter intuitive (all as_hal would come first) and I think it
additionally was just flat out broken in some ways
> -
https://discord.com/channels/691052431525675048/743663924229963868/1453786307099758683

Possible path forward is using multiple command buffers:
https://discord.com/channels/691052431525675048/743663924229963868/1453795633503670415

</summary>

---------

Co-authored-by: robtfm <50659922+robtfm@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@Wumpf Wumpf Wumpf approved these changes

+1 more reviewer

@luc-rodriguez luc-rodriguez luc-rodriguez left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@Wumpf Wumpf

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Limits and validation for multiview Tests for multiview support

5 participants

@inner-daemons @cwfitzgerald @Wumpf @luc-rodriguez