Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

dependencies: Upgrade surfman to 0.9 (#31224)

Browse source 
This upgrades surfman and webxr. The main benefit to this upgrade is
that surfman (and thus libservo) no longer depends on winit. servoshell
still does, but this should make upgrades a lot easier.
This commit is contained in:
Martin Robinson 2024-01-30 13:22:23 +01:00 • committed by GitHub
parent e726893165
commit a07ad85eaa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -5814,9 +5814,9 @@ dependencies = [
[[package]] [[package]]
name = "surfman" name = "surfman"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db2e4280229411d6eb8a8f873152dece1904df2682003bdc748adc181e003568" checksum = "29362235cba051e9e6eb5a136b32c1ab6933d2545e4fffd0ba22ac904498d0e2"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"cfg_aliases", "cfg_aliases",
@ -5839,7 +5839,6 @@ dependencies = [
"sparkle", "sparkle",
"wayland-sys 0.30.1", "wayland-sys 0.30.1",
"winapi", "winapi",
"winit",
"wio", "wio",
"x11", "x11",
] ]
@ -6892,7 +6891,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr" name = "webxr"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#3b2f303c0bdb70a8ca81ae30b012b4164c32fd40" source = "git+https://github.com/servo/webxr#f1cc78521616883ca1592129848b525dcf8b4136"
dependencies = [ dependencies = [
"android_injected_glue", "android_injected_glue",
"bindgen 0.69.2", "bindgen 0.69.2",
@ -6911,7 +6910,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr-api" name = "webxr-api"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#3b2f303c0bdb70a8ca81ae30b012b4164c32fd40" source = "git+https://github.com/servo/webxr#f1cc78521616883ca1592129848b525dcf8b4136"
dependencies = [ dependencies = [
"euclid", "euclid",
"ipc-channel", "ipc-channel",

2
Cargo.toml
View file

@ -96,7 +96,7 @@ string_cache = "0.8"
string_cache_codegen = "0.5" string_cache_codegen = "0.5"
style_traits = { path = "components/style_traits", features = ["servo"] } style_traits = { path = "components/style_traits", features = ["servo"] }
# NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms! # NOTE: the sm-angle feature only enables ANGLE on Windows, not other platforms!
surfman = { version = "0.8", features = ["chains", "sm-angle", "sm-angle-default"] } surfman = { version = "0.9", features = ["chains", "sm-angle", "sm-angle-default"] }
syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] } syn = { version = "2", default-features = false, features = ["clone-impls", "derive", "parsing"] }
synstructure = "0.13" synstructure = "0.13"
thin-vec = "0.2.13" thin-vec = "0.2.13"

7
ports/servoshell/headed_window.rs
View file

@ -133,7 +133,7 @@ impl Window {
.expect("Failed to create adapter"); .expect("Failed to create adapter");
let window_handle = winit_window.raw_window_handle(); let window_handle = winit_window.raw_window_handle();
let native_widget = connection let native_widget = connection
.create_native_widget_from_rwh(window_handle) .create_native_widget_from_raw_window_handle(window_handle, Size2D::new(width, height))
.expect("Failed to create native widget"); .expect("Failed to create native widget");
let surface_type = SurfaceType::Widget { native_widget }; let surface_type = SurfaceType::Widget { native_widget };
let rendering_context = RenderingContext::create(&connection, &adapter, surface_type) let rendering_context = RenderingContext::create(&connection, &adapter, surface_type)
@ -671,9 +671,12 @@ impl webxr::glwindow::GlWindow for XRWindow {
device: &mut Device, device: &mut Device,
_context: &mut Context, _context: &mut Context,
) -> webxr::glwindow::GlWindowRenderTarget { ) -> webxr::glwindow::GlWindowRenderTarget {
let window_handle = self.winit_window.raw_window_handle();
let size = self.winit_window.inner_size();
let size = Size2D::new(size.width as i32, size.height as i32);
let native_widget = device let native_widget = device
.connection() .connection()
.create_native_widget_from_winit_window(&self.winit_window) .create_native_widget_from_raw_window_handle(window_handle, size)
.expect("Failed to create native widget"); .expect("Failed to create native widget");
webxr::glwindow::GlWindowRenderTarget::NativeWidget(native_widget) webxr::glwindow::GlWindowRenderTarget::NativeWidget(native_widget)
} }