Skip to content

/ webrender

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync changes from mozilla-central gfx/wr #3838

Merged
merged 2 commits into from Jan 21, 2020
+77 −54
Merged

Sync changes from mozilla-central gfx/wr #3838

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f65754
Bug 1607836 - use SmallVec for render task dependencies. r=gw
nical Jan 21, 2020
dd9a549
Bug 1607836 - Preallocate picture task dependency vectors. r=gw
nical Jan 21, 2020
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

1 webrender/src/frame_builder.rs
View file
Open in desktop
@@ -438,6 +438,7 @@ impl FrameBuilder {

let pic = &mut scene.prim_store.pictures[scene.root_pic_index.0];
pic.restore_context(
ROOT_SURFACE_INDEX,
prim_list,
pic_context,
pic_state,
12 webrender/src/picture.rs
View file
Open in desktop
@@ -3277,6 +3277,10 @@ pub struct PicturePrimitive {

/// The config options for this picture.
pub options: PictureOptions,

/// Keep track of the number of render tasks dependencies to pre-allocate
/// the dependency array next frame.
num_render_tasks: usize,
}

impl PicturePrimitive {
@@ -3419,6 +3423,7 @@ impl PicturePrimitive {
tile_cache,
options,
segments_are_valid: false,
num_render_tasks: 0,
}
}

@@ -3461,6 +3466,9 @@ impl PicturePrimitive {
return None;
}

let task_id = frame_state.surfaces[parent_surface_index.0].render_tasks.unwrap().port;
frame_state.render_tasks[task_id].children.reserve(self.num_render_tasks);

// Extract the raster and surface spatial nodes from the raster
// config, if this picture establishes a surface. Otherwise just
// pass in the spatial node indices from the parent context.
@@ -4225,6 +4233,7 @@ impl PicturePrimitive {

pub fn restore_context(
&mut self,
parent_surface_index: SurfaceIndex,
prim_list: PrimitiveList,
context: PictureContext,
state: PictureState,
@@ -4235,6 +4244,9 @@ impl PicturePrimitive {
frame_state.pop_dirty_region();
}

let task_id = frame_state.surfaces[parent_surface_index.0].render_tasks.unwrap().port;
self.num_render_tasks = frame_state.render_tasks[task_id].children.len();

self.prim_list = prim_list;
self.state = Some(state);
}
1 webrender/src/prim_store/mod.rs
View file
Open in desktop
@@ -2732,6 +2732,7 @@ impl PrimitiveStore {
// Restore the dependencies (borrow check dance)
self.pictures[pic_context_for_children.pic_index.0]
.restore_context(
pic_context.surface_index,
prim_list,
pic_context_for_children,
pic_state_for_children,
67 webrender/src/render_task.rs
View file
Open in desktop
@@ -23,6 +23,7 @@ use std::{usize, f32, i32, u32};
use crate::render_target::{RenderTargetIndex, RenderTargetKind};
use crate::render_task_graph::{RenderTaskGraph, RenderTaskId};
use crate::render_task_cache::{RenderTaskCacheKey, RenderTaskCacheKeyKind};
use smallvec::SmallVec;

const RENDER_TASK_SIZE_SANITY_CHECK: i32 = 16000;
const FLOATS_PER_RENDER_TASK_INFO: usize = 8;
@@ -340,11 +341,17 @@ impl BlurTaskKey {
}
}

// The majority of render tasks have 0, 1 or 2 dependencies, except for pictures that
// typically have dozens to hundreds of dependencies. SmallVec with 2 inline elements
// avoids many tiny heap allocations in pages with a lot of text shadows and other
// types of render tasks.
pub type TaskDependencies = SmallVec<[RenderTaskId;2]>;

#[cfg_attr(feature = "capture", derive(Serialize))]
#[cfg_attr(feature = "replay", derive(Deserialize))]
pub struct RenderTask {
pub location: RenderTaskLocation,
pub children: Vec<RenderTaskId>,
pub children: TaskDependencies,
pub kind: RenderTaskKind,
pub clear_mode: ClearMode,
pub saved_index: Option<SavedTargetIndex>,
@@ -354,7 +361,7 @@ impl RenderTask {
#[inline]
pub fn with_dynamic_location(
size: DeviceIntSize,
children: Vec<RenderTaskId>,
children: TaskDependencies,
kind: RenderTaskKind,
clear_mode: ClearMode,
) -> Self {
@@ -373,7 +380,7 @@ impl RenderTask {
pub fn new_test(
target: RenderTargetKind,
location: RenderTaskLocation,
children: Vec<RenderTaskId>,
children: TaskDependencies,
) -> Self {
RenderTask {
location,
@@ -409,7 +416,7 @@ impl RenderTask {

RenderTask {
location,
children: Vec::new(),
children: TaskDependencies::new(),
kind: RenderTaskKind::Picture(PictureTask {
pic_index,
content_origin,
@@ -435,7 +442,7 @@ impl RenderTask {
) -> Self {
RenderTask::with_dynamic_location(
size,
Vec::new(),
TaskDependencies::new(),
RenderTaskKind::Gradient(GradientTask {
stops,
orientation,
@@ -449,7 +456,7 @@ impl RenderTask {
pub fn new_readback(screen_rect: DeviceIntRect) -> Self {
RenderTask::with_dynamic_location(
screen_rect.size,
Vec::new(),
TaskDependencies::new(),
RenderTaskKind::Readback(screen_rect),
ClearMode::Transparent,
)
@@ -473,8 +480,8 @@ impl RenderTask {
// and made available as an input when this task
// executes.
let children = match source {
BlitSource::RenderTask { task_id } => vec![task_id],
BlitSource::Image { .. } => vec![],
BlitSource::RenderTask { task_id } => smallvec![task_id],
BlitSource::Image { .. } => smallvec![],
};

RenderTask::with_dynamic_location(
@@ -497,7 +504,7 @@ impl RenderTask {
) -> Self {
RenderTask::with_dynamic_location(
size,
Vec::new(),
TaskDependencies::new(),
RenderTaskKind::LineDecoration(LineDecorationTask {
style,
orientation,
@@ -605,7 +612,7 @@ impl RenderTask {

RenderTask::with_dynamic_location(
outer_rect.size,
vec![],
smallvec![],
RenderTaskKind::CacheMask(CacheMaskTask {
actual_rect: outer_rect,
clip_node_range,
@@ -631,7 +638,7 @@ impl RenderTask {

RenderTask::with_dynamic_location(
size,
Vec::new(),
TaskDependencies::new(),
RenderTaskKind::ClipRegion(ClipRegionTask {
clip_data_address,
local_pos,
@@ -742,7 +749,7 @@ impl RenderTask {
let blur_task_id = cached_task.unwrap_or_else(|| {
let blur_task_v = RenderTask::with_dynamic_location(
adjusted_blur_target_size,
vec![downscaling_src_task_id],
smallvec![downscaling_src_task_id],
RenderTaskKind::VerticalBlur(BlurTask {
blur_std_deviation: adjusted_blur_std_deviation.height,
target_kind,
@@ -757,7 +764,7 @@ impl RenderTask {

let blur_task_h = RenderTask::with_dynamic_location(
adjusted_blur_target_size,
vec![blur_task_v_id],
smallvec![blur_task_v_id],
RenderTaskKind::HorizontalBlur(BlurTask {
blur_std_deviation: adjusted_blur_std_deviation.width,
target_kind,
@@ -784,7 +791,7 @@ impl RenderTask {
) -> Self {
RenderTask::with_dynamic_location(
size,
Vec::new(),
TaskDependencies::new(),
RenderTaskKind::Border(BorderTask {
instances,
}),
@@ -815,8 +822,8 @@ impl RenderTask {
padding: DeviceIntSideOffsets,
) -> Self {
let (uv_rect_kind, children, image) = match source {
BlitSource::RenderTask { task_id } => (render_tasks[task_id].uv_rect_kind(), vec![task_id], None),
BlitSource::Image { key } => (UvRectKind::Rect, vec![], Some(key)),
BlitSource::RenderTask { task_id } => (render_tasks[task_id].uv_rect_kind(), smallvec![task_id], None),
BlitSource::Image { key } => (UvRectKind::Rect, smallvec![], Some(key)),
};

RenderTask::with_dynamic_location(
@@ -865,7 +872,7 @@ impl RenderTask {
match (input_color_space, color_space) {
(ColorSpace::Srgb, ColorSpace::LinearRgb) => {
let task = RenderTask::new_svg_filter_primitive(
vec![task_id],
smallvec![task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::SrgbToLinear,
@@ -874,7 +881,7 @@ impl RenderTask {
},
(ColorSpace::LinearRgb, ColorSpace::Srgb) => {
let task = RenderTask::new_svg_filter_primitive(
vec![task_id],
smallvec![task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::LinearToSrgb,
@@ -924,7 +931,7 @@ impl RenderTask {
);

let task = RenderTask::new_svg_filter_primitive(
vec![input_1_task_id, input_2_task_id],
smallvec![input_1_task_id, input_2_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::Blend(blend.mode),
@@ -933,7 +940,7 @@ impl RenderTask {
},
FilterPrimitiveKind::Flood(ref flood) => {
let task = RenderTask::new_svg_filter_primitive(
vec![],
smallvec![],
content_size,
uv_rect_kind,
SvgFilterInfo::Flood(flood.color),
@@ -954,7 +961,7 @@ impl RenderTask {

// TODO: This is a hack to ensure that a blur task's input is always in the blur's previous pass.
let svg_task = RenderTask::new_svg_filter_primitive(
vec![input_task_id],
smallvec![input_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::Identity,
@@ -982,7 +989,7 @@ impl RenderTask {
);

let task = RenderTask::new_svg_filter_primitive(
vec![input_task_id],
smallvec![input_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::Opacity(opacity.opacity),
@@ -1001,7 +1008,7 @@ impl RenderTask {
);

let task = RenderTask::new_svg_filter_primitive(
vec![input_task_id],
smallvec![input_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::ColorMatrix(Box::new(color_matrix.matrix)),
@@ -1023,7 +1030,7 @@ impl RenderTask {
let offset = drop_shadow.shadow.offset * LayoutToWorldScale::new(1.0) * device_pixel_scale;

let offset_task = RenderTask::new_svg_filter_primitive(
vec![input_task_id],
smallvec![input_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::Offset(offset),
@@ -1041,7 +1048,7 @@ impl RenderTask {
);

let task = RenderTask::new_svg_filter_primitive(
vec![input_task_id, blur_task_id],
smallvec![input_task_id, blur_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::DropShadow(drop_shadow.shadow.color),
@@ -1065,7 +1072,7 @@ impl RenderTask {
input_task_id
} else {
let task = RenderTask::new_svg_filter_primitive(
vec![input_task_id],
smallvec![input_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::ComponentTransfer(filter_data.clone()),
@@ -1086,7 +1093,7 @@ impl RenderTask {

let offset = info.offset * LayoutToWorldScale::new(1.0) * device_pixel_scale;
let offset_task = RenderTask::new_svg_filter_primitive(
vec![input_task_id],
smallvec![input_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::Offset(offset),
@@ -1114,7 +1121,7 @@ impl RenderTask {
);

let task = RenderTask::new_svg_filter_primitive(
vec![input_1_task_id, input_2_task_id],
smallvec![input_1_task_id, input_2_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::Composite(info.operator),
@@ -1131,7 +1138,7 @@ impl RenderTask {
// Convert to sRGB if needed
if filter_primitives.last().unwrap().color_space == ColorSpace::LinearRgb {
let task = RenderTask::new_svg_filter_primitive(
vec![render_task_id],
smallvec![render_task_id],
content_size,
uv_rect_kind,
SvgFilterInfo::LinearToSrgb,
@@ -1143,7 +1150,7 @@ impl RenderTask {
}

pub fn new_svg_filter_primitive(
tasks: Vec<RenderTaskId>,
tasks: TaskDependencies,
target_size: DeviceIntSize,
uv_rect_kind: UvRectKind,
info: SvgFilterInfo,
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.