[Merged by Bors] - Update wgpu to 0.12 and naga to 0.8 #3375

vabka · 2021-12-18T21:25:58Z

Objective

Fixes #3352
Fixes #3208

Solution

Update wgpu to 0.12
Update naga to 0.8
Resolve compilation errors
Remove [[block]] from WGSL shaders (because it is depracated and now wgpu cant parse it)
Replace elseif with else if in pbr.wgsl

assets/shaders/custom_material.wgsl

crates/bevy_pbr/src/render/depth.wgsl

crates/bevy_gltf/Cargo.toml

bjorn3 · 2021-12-18T21:32:36Z

crates/bevy_pbr/src/render/mesh.rs

-                        comparison: true,
-                        filtering: true,
-                    },
+                    ty: BindingType::Sampler(SamplerBindingType::Comparison),


Can someone verify if this isn't a behavorial change.

+1
Also not sure

I dont know what these options should affect. But with SamplingBindingType::Filtering in panics on start.
Result looks pretty same.

Yeah I think comparison is fine for now. We might be able to rein this in, but this seems like the right choice for the current impl.

crates/bevy_gltf/Cargo.toml

crates/bevy_sprite/Cargo.toml

crates/bevy_sprite/src/render/mod.rs

crates/bevy_ui/Cargo.toml

bjorn3 · 2021-12-18T21:37:22Z

Thanks for the PR! I have a couple of nits and one thing someone else needs to check, but apart from that I don't see any issues.

crates/bevy_pbr/src/render/mesh_view_bind_group.wgsl

bjorn3

Looks like two files still have extra newlines. The rest has been fixed.

crates/bevy_pbr/src/render/mesh_view_bind_group.wgsl

crates/bevy_render/src/render_resource/shader.rs

Co-authored-by: bjorn3 <bjorn3@users.noreply.github.com>

…ader.rs

…_group.wgsl

vabka · 2021-12-18T21:58:52Z

finally😅. Removed all extra blank lines

mockersf · 2021-12-18T22:24:04Z

Could you also remove this line?

bevy/deny.toml

Line 61 in 8c25091

{ name = "raw-window-handle", version = "0.3" }, # from wgpu v0.11.1

It's a duplicate dependency that's no longer duplicated with the wgpu update 👍

vabka · 2021-12-18T22:28:48Z

@mockersf Why it was added? What 'raw-window-handle' does?
(Sorry if it is a stupid question. I am a newbie in rust)

@mockersf

…er update -- @mockersf

mockersf · 2021-12-18T23:08:52Z

Not a stupid question, no worries!

Bevy is using cargo-deny to help control the dependency list. With it, we can make CI fail for things like unmaintained dependencies, or duplicated dependencies.

In this case, raw-window-handle is a dependency added by both wgpu and winit, and it was updated in Bevy with the last winit update, while still depending on the previous version through wgpu. Now that wgpu is also updated, the last version of raw-window-handle is used everywhere so we don't need to accept it as a duplicated dependency.

raw-window-handle is... I don't know exactly, but it seems it's used to handle windows on all OS

mockersf

works on macOS

vabka · 2021-12-18T23:21:17Z

Thank you for such explanation :)

Josh015 · 2021-12-18T23:37:25Z

@vabka @mockersf raw-window-handle just lets a user pass a window handle to a graphics API so it knows where to render. Specifically, it hides the platform-specific details of this operation and moves that responsibility out of the user's code and into the crates they depend upon.

vabka · 2021-12-19T00:46:03Z

@vabka @mockersf raw-window-handle just lets a user pass a window handle to a graphics API so it knows where to render. Specifically, it hides the platform-specific details of this operation and moves that responsibility out of the user's code and into the crates they depend upon.

I mean "what bad thing it does so it was banned". I know what is window handle.
But thanks :)

cart · 2021-12-19T03:02:23Z

It wasn't banned, the "failure on duplicate dependency" was just suppressed.

cart · 2021-12-19T03:02:49Z

bors r+

# Objective Fixes #3352 Fixes #3208 ## Solution - Update wgpu to 0.12 - Update naga to 0.8 - Resolve compilation errors - Remove [[block]] from WGSL shaders (because it is depracated and now wgpu cant parse it) - Replace `elseif` with `else if` in pbr.wgsl

bors · 2021-12-19T03:22:08Z

Pull request successfully merged into main.

Build succeeded:

vabka added 4 commits December 19, 2021 02:22

first try in 2d

8144728

fix typo in shader (elseif -> else if)

1a995cb

wgpu 0.12

fa06777

remove commented [[block]]

496b934

github-actions bot added the S-Needs-Triage This issue needs to be labelled label Dec 18, 2021

bjorn3 reviewed Dec 18, 2021

View reviewed changes

assets/shaders/custom_material.wgsl Outdated Show resolved Hide resolved

bjorn3 reviewed Dec 18, 2021

View reviewed changes

crates/bevy_pbr/src/render/depth.wgsl Outdated Show resolved Hide resolved

bjorn3 reviewed Dec 18, 2021

View reviewed changes

crates/bevy_gltf/Cargo.toml Outdated Show resolved Hide resolved

bjorn3 reviewed Dec 18, 2021

View reviewed changes

cart mentioned this pull request Dec 18, 2021

Upgrade to wgpu 0.12 / naga 0.8 #3374

Closed

cart reviewed Dec 18, 2021

View reviewed changes

crates/bevy_gltf/Cargo.toml Outdated Show resolved Hide resolved

Remove extra empty lines in wgsl code

950b8a3

bjorn3 reviewed Dec 18, 2021

View reviewed changes

crates/bevy_sprite/Cargo.toml Outdated Show resolved Hide resolved

cargo fmt

3d97b9c

bjorn3 reviewed Dec 18, 2021

View reviewed changes

crates/bevy_sprite/src/render/mod.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Dec 18, 2021

View reviewed changes

crates/bevy_ui/Cargo.toml Outdated Show resolved Hide resolved

Fix formatting in cargo.toml

89183b6

add new line at end of bevy_sprite/cargo.toml

963a0fe

cart added this to the Bevy 0.6 milestone Dec 18, 2021

mrk-its reviewed Dec 18, 2021

View reviewed changes

crates/bevy_pbr/src/render/mesh_view_bind_group.wgsl Outdated Show resolved Hide resolved

vabka added 3 commits December 19, 2021 02:38

add new line at end of bevy_ui/cargo.toml

def8854

remove extra blank line in mesh_view_bind_group.wgsl

12f9b35

naga 0.8

b1b8f22

bjorn3 reviewed Dec 18, 2021

View reviewed changes

crates/bevy_pbr/src/render/mesh_view_bind_group.wgsl Outdated Show resolved Hide resolved

crates/bevy_render/src/render_resource/shader.rs Outdated Show resolved Hide resolved

Update crates/bevy_pbr/src/render/mesh_view_bind_group.wgsl

9a816d8

Co-authored-by: bjorn3 <bjorn3@users.noreply.github.com>

cart changed the title ~~Fix crash on amd GPUs~~ Update wgpu to 0.12 and naga to 0.8 Dec 18, 2021

vabka added 3 commits December 19, 2021 02:56

remove extra blank lines in crates/bevy_render/src/render_resource/sh…

5615bd2

…ader.rs

remove extra blank lines in crates/bevy_render/src/render_resource/sh…

19ba0f6

…ader.rs

remove extra blank lines in crates/bevy_pbr/src/render/mesh_view_bind…

4143709

…_group.wgsl

vabka added 2 commits December 19, 2021 03:12

fix compilation errors after updating naga

220160c

cargo fmt in shader.rs

06bdf0b

vabka added 2 commits December 19, 2021 03:29

Remove raw-window-handle from deny.toml because it is unnecessary aft…

b27615b

…er update -- @mockersf

Remove last extra blank line

6c243d6

mockersf approved these changes Dec 18, 2021

View reviewed changes

mockersf added A-Rendering Drawing game state to the screen C-Dependencies A change to the crates that Bevy depends on and removed S-Needs-Triage This issue needs to be labelled labels Dec 18, 2021

bors bot changed the title ~~Update wgpu to 0.12 and naga to 0.8~~ [Merged by Bors] - Update wgpu to 0.12 and naga to 0.8 Dec 19, 2021

bors bot closed this Dec 19, 2021

vabka deleted the fix-amd-gpu branch December 19, 2021 13:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Merged by Bors] - Update wgpu to 0.12 and naga to 0.8 #3375

[Merged by Bors] - Update wgpu to 0.12 and naga to 0.8 #3375

vabka commented Dec 18, 2021 •

edited

Loading

bjorn3 Dec 18, 2021

vabka Dec 18, 2021 •

edited

Loading

vabka Dec 18, 2021 •

edited

Loading

cart Dec 19, 2021

bjorn3 commented Dec 18, 2021

bjorn3 left a comment

vabka commented Dec 18, 2021 •

edited

Loading

mockersf commented Dec 18, 2021

vabka commented Dec 18, 2021

mockersf commented Dec 18, 2021

mockersf left a comment

vabka commented Dec 18, 2021

Josh015 commented Dec 18, 2021 •

edited

Loading

vabka commented Dec 19, 2021

cart commented Dec 19, 2021

cart commented Dec 19, 2021

bors bot commented Dec 19, 2021

[Merged by Bors] - Update wgpu to 0.12 and naga to 0.8 #3375

[Merged by Bors] - Update wgpu to 0.12 and naga to 0.8 #3375

Conversation

vabka commented Dec 18, 2021 • edited Loading

Objective

Solution

bjorn3 Dec 18, 2021

Choose a reason for hiding this comment

vabka Dec 18, 2021 • edited Loading

Choose a reason for hiding this comment

vabka Dec 18, 2021 • edited Loading

Choose a reason for hiding this comment

cart Dec 19, 2021

Choose a reason for hiding this comment

bjorn3 commented Dec 18, 2021

bjorn3 left a comment

Choose a reason for hiding this comment

vabka commented Dec 18, 2021 • edited Loading

mockersf commented Dec 18, 2021

vabka commented Dec 18, 2021

mockersf commented Dec 18, 2021

mockersf left a comment

Choose a reason for hiding this comment

vabka commented Dec 18, 2021

Josh015 commented Dec 18, 2021 • edited Loading

vabka commented Dec 19, 2021

cart commented Dec 19, 2021

cart commented Dec 19, 2021

bors bot commented Dec 19, 2021

vabka commented Dec 18, 2021 •

edited

Loading

vabka Dec 18, 2021 •

edited

Loading

vabka Dec 18, 2021 •

edited

Loading

vabka commented Dec 18, 2021 •

edited

Loading

Josh015 commented Dec 18, 2021 •

edited

Loading