Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1687536 - Move SWGL compositor into WebRender proper. r=lsalzman

Browse Source 
This will let us use it from Wrench.

Differential Revision: https://phabricator.services.mozilla.com/D102343
This commit is contained in:
Jeff Muizelaar 2021-02-07 20:04:14 +00:00
parent d0e2a2997e
commit 0abab2be63
9 changed files with 1806 additions and 1785 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -5848,6 +5848,7 @@ dependencies = [
"serde_json",
"smallvec",
"svg_fmt",
"swgl",
"time",
"tracy-rs",
"uuid",

2
gfx/webrender_bindings/Cargo.toml
View File

@ -28,7 +28,7 @@ wr_malloc_size_of = { path = "../wr/wr_malloc_size_of" }
path = "../wr/webrender"
version = "0.61.0"
default-features = false
features = ["capture", "serialize_program", "gecko"]
features = ["capture", "serialize_program", "gecko", "sw_compositor"]
[target.'cfg(target_os = "windows")'.dependencies]
dwrote = "0.11"

2
gfx/webrender_bindings/src/bindings.rs
View File

@ -31,7 +31,7 @@ use nsstring::nsAString;
use num_cpus;
use program_cache::{remove_disk_cache, WrProgramCache};
use rayon;
use swgl_bindings::SwCompositor;
use webrender::sw_compositor::SwCompositor;
use tracy_rs::register_thread_with_profiler;
use webrender::{
api::units::*, api::*, render_api::*, set_profiler_hooks, AsyncPropertySampler, AsyncScreenshotHandle, Compositor,

1785
gfx/webrender_bindings/src/swgl_bindings.rs
View File

File diff suppressed because it is too large Load Diff

1
gfx/wr/Cargo.lock generated
View File

@ -2027,6 +2027,7 @@ dependencies = [
"serde_json",
"smallvec 1.3.0",
"svg_fmt",
"swgl",
"time",
"tracy-rs",
"uuid",

2
gfx/wr/webrender/Cargo.toml
View File

@ -20,6 +20,7 @@ serialize_program = ["serde", "webrender_build/serialize_program"]
no_static_freetype = []
leak_checks = []
gecko = []
sw_compositor = ["swgl"]
[build-dependencies]
build-parallel = "0.1.2"
@ -58,6 +59,7 @@ svg_fmt = "0.4"
tracy-rs = "0.1.2"
derive_more = "0.99"
etagere = "0.2.4"
swgl = { path = "../swgl", optional = true }
[dev-dependencies]
mozangle = "0.3.2"

6
gfx/wr/webrender/src/compositor/mod.rs Normal file
View File

@ -0,0 +1,6 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#[cfg(feature = "sw_compositor")]
pub mod sw_compositor;

1788
gfx/wr/webrender/src/compositor/sw_compositor.rs Normal file
View File

File diff suppressed because it is too large Load Diff

4
gfx/wr/webrender/src/lib.rs
View File

@ -88,6 +88,7 @@ mod clip;
mod space;
mod spatial_tree;
mod composite;
mod compositor;
mod debug_colors;
mod debug_font_data;
mod debug_item;
@ -237,3 +238,6 @@ pub use crate::picture::{TileNode, TileNodeKind, TileSerializer, TileCacheInstan
pub use crate::intern::ItemUid;
pub use crate::render_api::*;
pub use crate::tile_cache::{PictureCacheDebugInfo, DirtyTileDebugInfo, TileDebugInfo, SliceDebugInfo};
#[cfg(feature = "sw_compositor")]
pub use crate::compositor::sw_compositor;