Skip to content

Commit b54fe63

Browse files
committed
winit and webrender decouple
webrender: Fix missing wr-frame-edges winit and webrender decouple relocate crates out dir wip fix decouple winit/webrender set surfman size fmt decouple input_processor decouple window from output cleanup wr_render_init move scale_factor to display_info move color bits to display info new canvas from frame directly some clean up window id usin raw handle wr output decouput font wip wip wr output decouput font build: use rust --cfg Fixed Cargo nonsense rust-lang/cargo#7463 rework winit_term configuration build pgtk with webrender configure pgtk with webrender
1 parent 08cd603 commit b54fe63

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3969
-2983
lines changed

.cargo/config.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[build]
2+
rustflags = [@RUSTFLAGS_CFG@]

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,3 +347,4 @@ lib-src/seccomp-filter-exec.pfc
347347
# GDB history
348348
.gdb_history
349349
_gdb_history
350+
/.cargo/config

Cargo.in

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ lsp_json = { version = "0.1.0", path = "rust_src/crates/lsp_json" }
3636
git = { version = "0.1.0", path = "rust_src/crates/git", optional = true }
3737
ng_module = { version = "0.1.0", path = "rust_src/crates/ng_module", optional = true }
3838
js = { version = "0.1.0", path = "rust_src/crates/js", optional = true }
39-
wrterm = { version = "0.1.0", path = "rust_src/crates/webrender", optional = true }
39+
winit_term = { version = "0.1.0", path = "rust_src/crates/winit-term", optional = true }
40+
webrender_bindings = { version = "0.1.0", path = "rust_src/crates/webrender", optional = true }
4041
clippy = { version = "*", optional = true }
4142
log = "0.4.17"
4243
tracing = "0.1"
@@ -57,19 +58,11 @@ default = [
5758

5859
# Compile with C xml2 library support.
5960
use-xml2 = []
60-
# Use a window system
61-
window-system = ["emacs/window-system"]
62-
# Use the x11 window system
63-
window-system-x11 = []
64-
# Use the nextstep window system
65-
window-system-nextstep = []
66-
# Use the w32 window system
67-
window-system-w32 = []
6861
# Build with git2rs support
6962
libgit = ["git", "ng-bindgen/libgit"]
70-
# Use the webrender window system
71-
webrender = ["dep:wrterm"]
72-
window-system-webrender = ["ng-bindgen/window-system-webrender", "webrender"]
63+
# Use the webrender renderer
64+
webrender = ["dep:webrender_bindings"]
65+
window-system-winit = ["dep:winit_term", "webrender"]
7366
# Treat warnings as a build error on Travis.
7467
strict = []
7568
# Use JavaScript and Deno
@@ -92,7 +85,7 @@ rev = "0a53c767463e13346221ad23fa6dd50cd787cd72"
9285

9386
[patch.crates-io.surfman]
9487
git ="https://github.com/declantsien/surfman.git"
95-
rev = "ad2bf7faacb5b240a47ce280f72e914d1590712f"
88+
rev = "caddee293e1f6ec8b33caec6170585a89c2674b8"
9689

9790
[patch.crates-io.surfman-chains]
9891
git = "https://github.com/declantsien/surfman-chains.git"

0 commit comments

Comments
 (0)