[Merged by Bors] - Update `wgpu` to 0.14.0, `naga` to `0.10.0`, `winit` to 0.27.4, `raw-window-handle` to 0.5.0, `ndk` to 0.7 by VitalyAnkh · Pull Request #6218 · bevyengine/bevy

VitalyAnkh · 2022-10-10T08:35:15Z

Objective

Update wgpu to 0.14.0, naga to 0.10.0, winit to 0.27.4, raw-window-handle to 0.5.0, ndk to 0.7.

Solution

Changelog

Changed

Changed RawWindowHandleWrapper to RawHandleWrapper which wraps both RawWindowHandle and RawDisplayHandle, which satisfies the impl HasRawWindowHandle and HasRawDisplayHandle that wgpu 0.14.0 requires.
Changed bevy_window::WindowDescriptor's cursor_locked to cursor_grab_mode, change its type from bool to bevy_window::CursorGrabMode.

Migration Guide

Adjust usage of bevy_window::WindowDescriptor's cursor_locked to cursor_grab_mode, and adjust its type from bool to bevy_window::CursorGrabMode.

mockersf · 2022-10-10T09:32:43Z

related to #5347 and #6086

crates/bevy_window/src/window.rs

alice-i-cecile · 2022-10-17T13:12:29Z

crates/bevy_winit/src/lib.rs

 }
+
+/// Map `bevy_window::CursorGrabMode` to `winit::window::CursorGrabMode`.
+fn winit_grab_mode(mode: bevy_window::CursorGrabMode) -> winit::window::CursorGrabMode {


IMO this should be a From impl.

Or I guess an Into impl if orphan rules get in the way.

I found it's not comfortable to do this for bevy_window::CursorGrabMode and winit::window:CursorGrabMode are not defined in the bevy_winit crate so orphan rules deny any From and Into impl. How about just using a match expression, removing this function?

Sure I'm fine with that.

Using a simple match causes code duplication so I suggest leaving code as it is 😄

alice-i-cecile

A couple tiny issues, but I'd like to get moving on this one. Reviewers: please test this one out; there's lots of potential for new serious hardware / OS / driver issues.

deny.toml

crates/bevy_window/src/window.rs

torsteingrindvik

Tried some examples locally:

wireframe
vertex_colors
two_passes
text
ui
sprite_sheet
transparency_3d
many_foxes

They all seem fine to me.

Co-authored-by: Torstein Grindvik <52322338+torsteingrindvik@users.noreply.github.com>

VitalyAnkh · 2022-10-18T07:14:11Z

I feel this PR is in good shape now. Ping @alice-i-cecile @mockersf.

rparrett · 2022-10-18T21:36:43Z

Tested all examples in the window and shader directories. (MacOS)

rparrett · 2022-10-19T14:22:42Z

I don't know what the normal state of affairs is for iOS, but in the simulator I have working touch camera controls and sound, but the "Test Button" does not work.

The console gets spammed with

2022-10-19T14:20:12.189477Z WARN winit::platform_impl::platform::app_state: processing non RedrawRequested event after the main event loop: RedrawEventsCleared

2022-10-19T14:20:12.198663Z WARN bevy_render::camera::camera_driver_node: Camera priority ambiguities detected for active cameras with the following priorities: {(0, Window(WindowId(00000000-0000-0000-0000-000000000000)))}. To fix this, ensure there is exactly one Camera entity spawned with a given priority for a given RenderTarget. Ambiguities should be resolved because either (1) multiple active cameras were spawned accidentally, which will result in rendering multiple instances of the scene or (2) for cases where multiple active cameras is intentional, ambiguities could result in unpredictable render results.

rparrett · 2022-10-19T14:33:29Z

The ios example is spawning 2 cameras for some reason. With that fixed, we're still left with the RedrawRequested spam and the broken button.

rparrett · 2022-10-19T14:36:48Z

Looks like the button is broken pre-this-PR as well so I think we're good to go there.

crates/bevy_render/src/view/window.rs

Co-authored-by: Rob Parrett <robparrett@gmail.com>

rparrett · 2022-10-19T16:55:07Z

I got the android example running on my device (pixel 2 xl) but only with NDK 25.1.8937393 and compiling without bevy_audio.

cargo apk run --example android_example --no-default-features --features "bevy_winit,render,bevy_asset"

I had to lower a WgpuLimit:

let mut settings = WgpuSettings {
    priority: WgpuSettingsPriority::Compatibility,
    ..default()
};
settings.limits.max_storage_textures_per_shader_stage = 4;

And resuming after putting the app in the background causes it to crash with this error:

10-19 12:52:26.837  8148  8181 E vulkan  : NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS query failed: No such device (-19) value=0
10-19 12:52:26.837  8148  8181 E log event:  get_physical_device_surface_present_modes: ERROR_SURFACE_LOST_KHRlog.target = "wgpu_hal::vulkan::adapter"; log.module_path = "wgpu_hal::vulkan::adapter"; log.file = "/Users/robparrett/.cargo/registry/src/github.com-1ecc6299db9ec823/wgpu-hal-0.14.0/src/vulkan/adapter.rs"; log.line = 1512;
10-19 12:52:26.838  8148  8181 E vulkan  : dequeueBuffer failed: No such device (-19)

I had thought that we'd be able to do audio now that we have ndk-glue 0.7 across the board. But this was my first time actually succeeding in running on android and I haven't been following the progress there closely.

Regardless, I don't think there's a regression here, so we're probably good to go.

VitalyAnkh · 2022-10-19T17:02:09Z

And resuming after putting the app in the background causes it to crash with this error

I think this deserves an issue report, and let's fix it in the future 🚀

mockersf · 2022-10-19T17:03:25Z

I had thought that we'd be able to do audio now that we have ndk-glue 0.7 across the board. But this was my first time actually succeeding in running on android and I haven't been following the progress there closely.

No, rodio hasn't been updated to the latest latest ndk-glue... 😞

Regardless, I don't think there's a regression here, so we're probably good to go.

Yup, all things you mentioned are expected 👍

mockersf · 2022-10-19T17:05:36Z

thanks @rparrett for testing on iOS and Android 🎉

alice-i-cecile · 2022-10-19T17:09:38Z

Alright, I'm going to call this sufficiently tested and reviewed and merge it now.

bors r+

…window-handle` to 0.5.0, `ndk` to 0.7 (#6218) # Objective - Update `wgpu` to 0.14.0, `naga` to `0.10.0`, `winit` to 0.27.4, `raw-window-handle` to 0.5.0, `ndk` to 0.7. ## Solution --- ## Changelog ### Changed - Changed `RawWindowHandleWrapper` to `RawHandleWrapper` which wraps both `RawWindowHandle` and `RawDisplayHandle`, which satisfies the `impl HasRawWindowHandle and HasRawDisplayHandle` that `wgpu` 0.14.0 requires. - Changed `bevy_window::WindowDescriptor`'s `cursor_locked` to `cursor_grab_mode`, change its type from `bool` to `bevy_window::CursorGrabMode`. ## Migration Guide - Adjust usage of `bevy_window::WindowDescriptor`'s `cursor_locked` to `cursor_grab_mode`, and adjust its type from `bool` to `bevy_window::CursorGrabMode`.

bors · 2022-10-19T18:06:06Z

Pull request successfully merged into main.

Build succeeded:

…window-handle` to 0.5.0, `ndk` to 0.7 (bevyengine#6218) # Objective - Update `wgpu` to 0.14.0, `naga` to `0.10.0`, `winit` to 0.27.4, `raw-window-handle` to 0.5.0, `ndk` to 0.7. ## Solution --- ## Changelog ### Changed - Changed `RawWindowHandleWrapper` to `RawHandleWrapper` which wraps both `RawWindowHandle` and `RawDisplayHandle`, which satisfies the `impl HasRawWindowHandle and HasRawDisplayHandle` that `wgpu` 0.14.0 requires. - Changed `bevy_window::WindowDescriptor`'s `cursor_locked` to `cursor_grab_mode`, change its type from `bool` to `bevy_window::CursorGrabMode`. ## Migration Guide - Adjust usage of `bevy_window::WindowDescriptor`'s `cursor_locked` to `cursor_grab_mode`, and adjust its type from `bool` to `bevy_window::CursorGrabMode`.

# Objective - Bevy main crashs on Safari mobile - On Safari mobile, calling winit_window.set_cursor_grab(true) fails as the API is not implemented (as there is no cursor on Safari mobile, the api doesn't make sense there). I don't know about other mobile browsers ## Solution - Do not call the api to release cursor grab on window creation, as the cursor is not grabbed anyway at this point - This is #3617 which was lost in #6218

…window-handle` to 0.5.0, `ndk` to 0.7 (bevyengine#6218) # Objective - Update `wgpu` to 0.14.0, `naga` to `0.10.0`, `winit` to 0.27.4, `raw-window-handle` to 0.5.0, `ndk` to 0.7. ## Solution --- ## Changelog ### Changed - Changed `RawWindowHandleWrapper` to `RawHandleWrapper` which wraps both `RawWindowHandle` and `RawDisplayHandle`, which satisfies the `impl HasRawWindowHandle and HasRawDisplayHandle` that `wgpu` 0.14.0 requires. - Changed `bevy_window::WindowDescriptor`'s `cursor_locked` to `cursor_grab_mode`, change its type from `bool` to `bevy_window::CursorGrabMode`. ## Migration Guide - Adjust usage of `bevy_window::WindowDescriptor`'s `cursor_locked` to `cursor_grab_mode`, and adjust its type from `bool` to `bevy_window::CursorGrabMode`.

…e#6381) # Objective - Bevy main crashs on Safari mobile - On Safari mobile, calling winit_window.set_cursor_grab(true) fails as the API is not implemented (as there is no cursor on Safari mobile, the api doesn't make sense there). I don't know about other mobile browsers ## Solution - Do not call the api to release cursor grab on window creation, as the cursor is not grabbed anyway at this point - This is bevyengine#3617 which was lost in bevyengine#6218

VitalyAnkh force-pushed the new_winit branch 3 times, most recently from 716b294 to 8e661f0 Compare October 10, 2022 09:15

VitalyAnkh force-pushed the new_winit branch 4 times, most recently from 07744da to e8f72ea Compare October 10, 2022 14:02

alice-i-cecile added the C-Dependencies A change to the crates that Bevy depends on label Oct 10, 2022

VitalyAnkh changed the title ~~Update wgpu to 0.14.0, winit to 0.27.4, raw-window-handle to 0.5.0~~ Update wgpu to 0.14.0, naga to 0.10.0, winit to 0.27.4, raw-window-handle to 0.5.0 Oct 12, 2022

VitalyAnkh changed the title ~~Update wgpu to 0.14.0, naga to 0.10.0, winit to 0.27.4, raw-window-handle to 0.5.0~~ Update wgpu to 0.14.0, naga to 0.10.0, winit to 0.27.4, raw-window-handle to 0.5.0, ndk to 0.7 Oct 12, 2022

alice-i-cecile reviewed Oct 17, 2022

View reviewed changes

crates/bevy_window/src/window.rs Show resolved Hide resolved

alice-i-cecile reviewed Oct 17, 2022

View reviewed changes

alice-i-cecile requested changes Oct 17, 2022

View reviewed changes

mockersf reviewed Oct 17, 2022

View reviewed changes

deny.toml Outdated Show resolved Hide resolved

torsteingrindvik reviewed Oct 17, 2022

View reviewed changes

crates/bevy_window/src/window.rs Outdated Show resolved Hide resolved

torsteingrindvik reviewed Oct 17, 2022

View reviewed changes

crates/bevy_window/src/window.rs Outdated Show resolved Hide resolved

torsteingrindvik approved these changes Oct 17, 2022

View reviewed changes

VitalyAnkh and others added 3 commits October 18, 2022 10:41

Update wgpu to 0.14.0, winit to 0.27.4, raw-window-handle to 0.5.0

21450ce

Apply suggestions from code reviewer @torsteingrindvik

b08d6fc

Co-authored-by: Torstein Grindvik <52322338+torsteingrindvik@users.noreply.github.com>

rebase

27e1eb2

VitalyAnkh force-pushed the new_winit branch from fd9aec9 to 27e1eb2 Compare October 18, 2022 03:00

VitalyAnkh added 5 commits October 18, 2022 11:03

cargo fmt --all

1437e12

deny old duplicate dependencies other than new ones

6b280eb

add doc for bevy::window:CursorGrabMode

600489e

improve doc

624f7f8

improve doc

76c99ee

alice-i-cecile added this to the Bevy 0.9 milestone Oct 18, 2022

alice-i-cecile added A-Input Player input via keyboard, mouse, gamepad, and more A-Windowing Platform-agnostic interface layer to run your app in labels Oct 19, 2022

This was referenced Oct 19, 2022

Winit 0.27 update #5347

Closed

Update winit version 0.27.3 #6086

Closed

move cursor grab mode convert function to bevy_winit::converters

de211bf

mockersf approved these changes Oct 19, 2022

View reviewed changes

fix deny.toml

807b29c

rparrett reviewed Oct 19, 2022

View reviewed changes

crates/bevy_render/src/view/window.rs Outdated Show resolved Hide resolved

Update crates/bevy_render/src/view/window.rs

8d70c22

Co-authored-by: Rob Parrett <robparrett@gmail.com>

rparrett approved these changes Oct 19, 2022

View reviewed changes

bors bot changed the title ~~Update wgpu to 0.14.0, naga to 0.10.0, winit to 0.27.4, raw-window-handle to 0.5.0, ndk to 0.7~~ [Merged by Bors] - Update wgpu to 0.14.0, naga to 0.10.0, winit to 0.27.4, raw-window-handle to 0.5.0, ndk to 0.7 Oct 19, 2022

bors bot closed this Oct 19, 2022

mockersf added the hacktoberfest-accepted label Oct 19, 2022

ickk added the M-Migration-Guide A breaking change to Bevy's public API that needs to be noted in a migration guide label Oct 25, 2022

mockersf mentioned this pull request Oct 26, 2022

[Merged by Bors] - do not set cursor grab on window creation if not asked for #6381

Closed

Uh oh!

Conversation

VitalyAnkh commented Oct 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Objective

Solution

Changelog

Changed

Migration Guide

Uh oh!

mockersf commented Oct 10, 2022

Uh oh!

Uh oh!

alice-i-cecile Oct 17, 2022

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile Oct 17, 2022

Choose a reason for hiding this comment

Uh oh!

VitalyAnkh Oct 18, 2022

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile Oct 18, 2022

Choose a reason for hiding this comment

Uh oh!

VitalyAnkh Oct 18, 2022

Choose a reason for hiding this comment

Uh oh!

alice-i-cecile left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

torsteingrindvik left a comment

Choose a reason for hiding this comment

Uh oh!

VitalyAnkh commented Oct 18, 2022

Uh oh!

rparrett commented Oct 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rparrett commented Oct 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rparrett commented Oct 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rparrett commented Oct 19, 2022

Uh oh!

Uh oh!

rparrett commented Oct 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VitalyAnkh commented Oct 19, 2022

Uh oh!

mockersf commented Oct 19, 2022

Uh oh!

mockersf commented Oct 19, 2022

Uh oh!

alice-i-cecile commented Oct 19, 2022

Uh oh!

bors bot commented Oct 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

VitalyAnkh commented Oct 10, 2022 •

edited

Loading

rparrett commented Oct 18, 2022 •

edited

Loading

rparrett commented Oct 19, 2022 •

edited

Loading

rparrett commented Oct 19, 2022 •

edited

Loading

rparrett commented Oct 19, 2022 •

edited

Loading