Skip to content

Commit

Permalink
winit and webrender decouple
Browse files Browse the repository at this point in the history
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
  • Loading branch information
declantsien committed Feb 23, 2023
1 parent 08cd603 commit b54fe63
Show file tree
Hide file tree
Showing 90 changed files with 3,969 additions and 2,983 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.in
@@ -0,0 +1,2 @@
[build]
rustflags = [@RUSTFLAGS_CFG@]
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -347,3 +347,4 @@ lib-src/seccomp-filter-exec.pfc
# GDB history
.gdb_history
_gdb_history
/.cargo/config
19 changes: 6 additions & 13 deletions Cargo.in
Expand Up @@ -36,7 +36,8 @@ lsp_json = { version = "0.1.0", path = "rust_src/crates/lsp_json" }
git = { version = "0.1.0", path = "rust_src/crates/git", optional = true }
ng_module = { version = "0.1.0", path = "rust_src/crates/ng_module", optional = true }
js = { version = "0.1.0", path = "rust_src/crates/js", optional = true }
wrterm = { version = "0.1.0", path = "rust_src/crates/webrender", optional = true }
winit_term = { version = "0.1.0", path = "rust_src/crates/winit-term", optional = true }
webrender_bindings = { version = "0.1.0", path = "rust_src/crates/webrender", optional = true }
clippy = { version = "*", optional = true }
log = "0.4.17"
tracing = "0.1"
Expand All @@ -57,19 +58,11 @@ default = [

# Compile with C xml2 library support.
use-xml2 = []
# Use a window system
window-system = ["emacs/window-system"]
# Use the x11 window system
window-system-x11 = []
# Use the nextstep window system
window-system-nextstep = []
# Use the w32 window system
window-system-w32 = []
# Build with git2rs support
libgit = ["git", "ng-bindgen/libgit"]
# Use the webrender window system
webrender = ["dep:wrterm"]
window-system-webrender = ["ng-bindgen/window-system-webrender", "webrender"]
# Use the webrender renderer
webrender = ["dep:webrender_bindings"]
window-system-winit = ["dep:winit_term", "webrender"]
# Treat warnings as a build error on Travis.
strict = []
# Use JavaScript and Deno
Expand All @@ -92,7 +85,7 @@ rev = "0a53c767463e13346221ad23fa6dd50cd787cd72"

[patch.crates-io.surfman]
git ="https://github.com/declantsien/surfman.git"
rev = "ad2bf7faacb5b240a47ce280f72e914d1590712f"
rev = "caddee293e1f6ec8b33caec6170585a89c2674b8"

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

0 comments on commit b54fe63

Please sign in to comment.