michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #322 from pcwalton/surfman-x11 

Switch to using surfman in X11 mode.
This commit is contained in:
Patrick Walton 2020-05-08 12:45:32 -07:00 committed by GitHub
parent 5362d3a51e 90fb36f199
commit e4edb23360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -2484,6 +2484,7 @@ dependencies = [
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)", "winit 0.19.3 (registry+https://github.com/rust-lang/crates.io-index)",
"wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "wio 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"x11 2.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

2
demo/native/Cargo.toml
View File

@ -40,7 +40,7 @@ path = "../../simd"
[dependencies.surfman] [dependencies.surfman]
git = "https://github.com/pcwalton/surfman" git = "https://github.com/pcwalton/surfman"
rev = "616b9e020585dd650120fb1e6cceb0e2bb43199a" rev = "616b9e020585dd650120fb1e6cceb0e2bb43199a"
features = ["sm-winit"] features = ["sm-winit", "sm-x11"]
[dependencies.winit] [dependencies.winit]
version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105 version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105

2
examples/canvas_minimal/Cargo.toml
View File

@ -37,7 +37,7 @@ path = "../../resources"
[dependencies.surfman] [dependencies.surfman]
version = "0.2" version = "0.2"
features = ["sm-winit"] features = ["sm-winit", "sm-x11"]
[dependencies.winit] [dependencies.winit]
version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105 version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105

2
examples/canvas_moire/Cargo.toml
View File

@ -39,7 +39,7 @@ path = "../../resources"
[dependencies.surfman] [dependencies.surfman]
git = "https://github.com/pcwalton/surfman" git = "https://github.com/pcwalton/surfman"
rev = "616b9e020585dd650120fb1e6cceb0e2bb43199a" rev = "616b9e020585dd650120fb1e6cceb0e2bb43199a"
features = ["sm-winit"] features = ["sm-winit", "sm-x11"]
[dependencies.winit] [dependencies.winit]
version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105 version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105

2
examples/canvas_nanovg/Cargo.toml
View File

@ -53,7 +53,7 @@ path = "../../simd"
[dependencies.surfman] [dependencies.surfman]
git = "https://github.com/pcwalton/surfman" git = "https://github.com/pcwalton/surfman"
rev = "bc29e7ae88ca7dd64d3b1c7e185604693290207f" rev = "bc29e7ae88ca7dd64d3b1c7e185604693290207f"
features = ["sm-winit"] features = ["sm-winit", "sm-x11"]
[dependencies.winit] [dependencies.winit]
version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105 version = "<0.19.4" # 0.19.4 causes build errors https://github.com/rust-windowing/winit/pull/1105