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

Update surfman to use Git version

Browse source
This commit is contained in:
Manish Goregaokar 2019-11-08 09:49:12 -08:00
parent 51bf8fcfe3
commit 2436bd195a
4 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -4883,9 +4883,9 @@ dependencies = [
[[package]] [[package]]
name = "sparkle" name = "sparkle"
version = "0.1.8" version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25e193f97790240fc9208b077001c8331f4ccc801daa4df56efcb90e513c0989" checksum = "84b935631ddcc08b257a331ac645cc6831e52a4ff55d4c430142575c6757a094"
dependencies = [ dependencies = [
"gl_generator 0.13.1", "gl_generator 0.13.1",
] ]
@ -5069,8 +5069,9 @@ dependencies = [
[[package]] [[package]]
name = "surfman" name = "surfman"
version = "0.23.0" version = "0.1.0"
source = "git+https://github.com/pcwalton/surfman#ffc4e4fda0b58554d4029f0d3d9abe85b42307ed" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7131f4831a7c13f3e90b16b0d7389b8875cc53807312c2697547763bfe7782b8"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cgl 0.3.2", "cgl 0.3.2",
@ -5097,7 +5098,8 @@ dependencies = [
[[package]] [[package]]
name = "surfman-chains" name = "surfman-chains"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/asajeffrey/surfman-chains#6b66ad3d4325e76ce9ffcbd79eaf5b5d518902fb" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab6ab2f8da08cd1ca6491fc0fd4c4aedc36adde0d6b3f64a6325b35dfce50ec5"
dependencies = [ dependencies = [
"euclid", "euclid",
"fnv", "fnv",
@ -5996,7 +5998,7 @@ dependencies = [
[[package]] [[package]]
name = "webxr" name = "webxr"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/webxr#6545972b8305642b384702726e11198ce5e96be8" source = "git+https://github.com/servo/webxr#4953e60dd9ff80324739eee22283d9b80f5c9559"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"euclid", "euclid",
@ -6015,7 +6017,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#6545972b8305642b384702726e11198ce5e96be8" source = "git+https://github.com/servo/webxr#4953e60dd9ff80324739eee22283d9b80f5c9559"
dependencies = [ dependencies = [
"euclid", "euclid",
"ipc-channel", "ipc-channel",

4
components/canvas/Cargo.toml
View file

@ -39,5 +39,5 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webrender_traits = {path = "../webrender_traits"} webrender_traits = {path = "../webrender_traits"}
webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]} webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
# 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 = { git = "https://github.com/pcwalton/surfman", features = ["sm-angle", "sm-osmesa"] } surfman = { version = "0.1", features = ["sm-angle", "sm-osmesa"] }
surfman-chains = { git = "https://github.com/asajeffrey/surfman-chains" } surfman-chains = "0.1"

4
components/canvas/webgl_thread.rs
View file

@ -588,6 +588,10 @@ impl WebGLThread {
swap_chain swap_chain
.resize(&mut self.device, &mut data.ctx, size.to_i32()) .resize(&mut self.device, &mut data.ctx, size.to_i32())
.expect("Failed to resize swap chain"); .expect("Failed to resize swap chain");
// temporary, till https://github.com/pcwalton/surfman/issues/35 is fixed
self.device
.make_context_current(&data.ctx)
.expect("Failed to make context current again");
swap_chain swap_chain
.clear_surface(&mut self.device, &mut data.ctx, &*data.gl) .clear_surface(&mut self.device, &mut data.ctx, &*data.gl)
.expect("Failed to clear resized swap chain"); .expect("Failed to clear resized swap chain");

2
components/servo/Cargo.toml
View file

@ -82,7 +82,7 @@ webdriver_server = {path = "../webdriver_server", optional = true}
webvr = {path = "../webvr"} webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"} webvr_traits = {path = "../webvr_traits"}
webxr-api = {git = "https://github.com/servo/webxr"} webxr-api = {git = "https://github.com/servo/webxr"}
surfman = { git = "https://github.com/pcwalton/surfman", features = ["sm-osmesa"] } surfman = { version = "0.1", features = ["sm-osmesa"] }
[target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
gaol = "0.2.1" gaol = "0.2.1"