Skip to content
Permalink
Browse files

Update surfman to use Git version

  • Loading branch information
Manishearth committed Nov 8, 2019
1 parent 51bf8fc commit 2436bd195a0852315efcda5f1c587f30a522fafd
Showing with 16 additions and 10 deletions.
  1. +9 −7 Cargo.lock
  2. +2 −2 components/canvas/Cargo.toml
  3. +4 −0 components/canvas/webgl_thread.rs
  4. +1 −1 components/servo/Cargo.toml

Some generated files are not rendered by default. Learn more.

@@ -39,5 +39,5 @@ webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}
webrender_traits = {path = "../webrender_traits"}
webxr-api = {git = "https://github.com/servo/webxr", features = ["ipc"]}
# 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-chains = { git = "https://github.com/asajeffrey/surfman-chains" }
surfman = { version = "0.1", features = ["sm-angle", "sm-osmesa"] }
surfman-chains = "0.1"
@@ -588,6 +588,10 @@ impl WebGLThread {
swap_chain
.resize(&mut self.device, &mut data.ctx, size.to_i32())
.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
.clear_surface(&mut self.device, &mut data.ctx, &*data.gl)
.expect("Failed to clear resized swap chain");
@@ -82,7 +82,7 @@ webdriver_server = {path = "../webdriver_server", optional = true}
webvr = {path = "../webvr"}
webvr_traits = {path = "../webvr_traits"}
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]
gaol = "0.2.1"

0 comments on commit 2436bd1

Please sign in to comment.
You can’t perform that action at this time.