aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2019-11-04 08:45:59 -0800
committerManish Goregaokar <manishsmail@gmail.com>2019-11-04 08:45:59 -0800
commite6989d692c9d0cb47bfb41a78daa54d36a0fd686 (patch)
treebdee506cc5a7f55fc67c009bd80debb149a3a16c
parentf626355b67fc007d5961c446d5a4ddbcc3785698 (diff)
downloadservo-e6989d692c9d0cb47bfb41a78daa54d36a0fd686.tar.gz
servo-e6989d692c9d0cb47bfb41a78daa54d36a0fd686.zip
Patch surfman and webxr
-rw-r--r--Cargo.lock6
-rw-r--r--Cargo.toml9
2 files changed, 12 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 8770e753390..02e09f392cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5069,7 +5069,7 @@ dependencies = [
[[package]]
name = "surfman"
version = "0.23.0"
-source = "git+https://github.com/pcwalton/surfman#9d8b8062fba129f058b47388f4f0262a19ff65c3"
+source = "git+https://github.com/jdm/rust-offscreen-rendering-context?branch=servo#dc5cf4369105f566fe95daac75bce748ae1a1c41"
dependencies = [
"bitflags",
"cgl 0.3.2",
@@ -5995,7 +5995,7 @@ dependencies = [
[[package]]
name = "webxr"
version = "0.0.1"
-source = "git+https://github.com/servo/webxr#94bf6c6f64007a42d74ee4d1d162a5ed4d32d12a"
+source = "git+https://github.com/jdm/webxr?branch=no-gl-readback2#12e04bafc2c692bce303b2a9fa5e811e76fbaa0e"
dependencies = [
"bindgen",
"euclid",
@@ -6014,7 +6014,7 @@ dependencies = [
[[package]]
name = "webxr-api"
version = "0.0.1"
-source = "git+https://github.com/servo/webxr#94bf6c6f64007a42d74ee4d1d162a5ed4d32d12a"
+source = "git+https://github.com/jdm/webxr?branch=no-gl-readback2#12e04bafc2c692bce303b2a9fa5e811e76fbaa0e"
dependencies = [
"euclid",
"ipc-channel",
diff --git a/Cargo.toml b/Cargo.toml
index ee35ba935a9..45a645eb194 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,3 +29,12 @@ opt-level = 3
mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
# https://github.com/retep998/winapi-rs/pull/816
winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }
+
+
+# temporary
+[patch."https://github.com/pcwalton/surfman"]
+surfman = { git = "https://github.com/jdm/rust-offscreen-rendering-context", branch = "servo" }
+
+[patch."https://github.com/servo/webxr"]
+webxr = { git = "https://github.com/jdm/webxr", branch = "no-gl-readback2" }
+webxr-api = { git = "https://github.com/jdm/webxr", branch = "no-gl-readback2" }