Integrate swapchain surface provider changes into webgl and webxr implementations.

This commit is contained in:
Josh Matthews 2020-02-27 16:41:35 -05:00
parent b062f51495
commit fbcf2bbc3e
17 changed files with 223 additions and 117 deletions

52
Cargo.lock generated
View file

@ -496,8 +496,8 @@ dependencies = [
"raqote",
"servo_config",
"sparkle",
"surfman 0.1.3",
"surfman-chains 0.2.1",
"surfman 0.1.4",
"surfman-chains 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"surfman-chains-api",
"time",
"webrender",
@ -742,6 +742,7 @@ dependencies = [
name = "compositing"
version = "0.0.1"
dependencies = [
"canvas",
"crossbeam-channel",
"embedder_traits",
"euclid",
@ -3184,7 +3185,7 @@ dependencies = [
"sparkle",
"style",
"style_traits",
"surfman 0.1.3",
"surfman 0.1.4",
"webdriver_server",
"webgpu",
"webrender",
@ -5046,7 +5047,7 @@ dependencies = [
"servo-media",
"sparkle",
"surfman 0.2.0",
"surfman-chains 0.3.0",
"surfman-chains 0.3.0 (git+https://github.com/asajeffrey/surfman-chains?branch=multi)",
"surfman-chains-api",
]
@ -5697,9 +5698,9 @@ dependencies = [
[[package]]
name = "surfman"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10248da202c1c8d8798783bbc4ba08e81ff225c6e2a394d64748d2a62acb198c"
checksum = "43bf043642ad98aaa51956091c4f829a400bad5f023b5f0095ecda61f925c63d"
dependencies = [
"bitflags",
"cgl 0.3.2",
@ -5726,7 +5727,7 @@ dependencies = [
[[package]]
name = "surfman"
version = "0.2.0"
source = "git+https://github.com/pcwalton/surfman?branch=multi#808e5c5906dbcc6707536c8bac8bcc9389b4e1eb"
source = "git+https://github.com/pcwalton/surfman?branch=multi#fb782262617e7ca839a4e487b116a5199afaf963"
dependencies = [
"bitflags",
"cgl 0.3.2",
@ -5750,20 +5751,6 @@ dependencies = [
"x11",
]
[[package]]
name = "surfman-chains"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2c1b5976b229a807a9e79b3b5248da577948b9882c77f2afce27cf562f80e22"
dependencies = [
"euclid",
"fnv",
"log",
"sparkle",
"surfman 0.1.3",
"surfman-chains-api",
]
[[package]]
name = "surfman-chains"
version = "0.3.0"
@ -5777,6 +5764,20 @@ dependencies = [
"surfman-chains-api",
]
[[package]]
name = "surfman-chains"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2a679f5be9644bbf93662f3b1a704cc6b81c147d4b7d6d5c8d8b6f453176f01"
dependencies = [
"euclid",
"fnv",
"log",
"sparkle",
"surfman 0.1.4",
"surfman-chains-api",
]
[[package]]
name = "surfman-chains-api"
version = "0.2.0"
@ -6649,9 +6650,10 @@ dependencies = [
[[package]]
name = "webxr"
version = "0.0.1"
source = "git+https://github.com/servo/webxr#a1afba096c9797c3663727de58f54eae898f3050"
source = "git+https://github.com/servo/webxr#3ac3e83f37ff64c74c847a610a8cefba9b907a9c"
dependencies = [
"bindgen",
"crossbeam-channel",
"euclid",
"gl_generator 0.13.1",
"gleam 0.9.2",
@ -6659,8 +6661,8 @@ dependencies = [
"log",
"openxr",
"serde",
"surfman 0.1.3",
"surfman-chains 0.2.1",
"surfman 0.1.4",
"surfman-chains 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time",
"webxr-api",
"winapi",
@ -6670,7 +6672,7 @@ dependencies = [
[[package]]
name = "webxr-api"
version = "0.0.1"
source = "git+https://github.com/servo/webxr#a1afba096c9797c3663727de58f54eae898f3050"
source = "git+https://github.com/servo/webxr#3ac3e83f37ff64c74c847a610a8cefba9b907a9c"
dependencies = [
"euclid",
"ipc-channel",