mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1501323 - Update webrender to a8817b943a2fd0038307a7432fdf5cbccf4a943e. r=kats 

Differential Revision: https://phabricator.services.mozilla.com/D9540

--HG--
extra : moz-landing-system : lando
This commit is contained in:
WR Updater Bot 2018-10-23 15:18:03 +00:00
Родитель deeea8a17c
Коммит 7bbf79df16
5 изменённых файлов: 78 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

94
gfx/webrender/src/batch.rs
Просмотреть файл

@ -9,14 +9,14 @@ use clip::{ClipDataStore, ClipNodeFlags, ClipNodeRange, ClipItem, ClipStore};
use clip_scroll_tree::{ClipScrollTree, ROOT_SPATIAL_NODE_INDEX, SpatialNodeIndex};
use glyph_rasterizer::GlyphFormat;
use gpu_cache::{GpuCache, GpuCacheHandle, GpuCacheAddress};
use gpu_types::{BrushFlags, BrushInstance, PrimitiveHeaders};
use gpu_types::{BrushFlags, BrushInstance, PrimitiveHeaders, ZBufferId, ZBufferIdGenerator};
use gpu_types::{ClipMaskInstance, SplitCompositeInstance};
use gpu_types::{PrimitiveInstanceData, RasterizationSpace, GlyphInstance};
use gpu_types::{PrimitiveHeader, PrimitiveHeaderIndex, TransformPaletteId, TransformPalette};
use internal_types::{FastHashMap, SavedTargetIndex, TextureSource};
use picture::{Picture3DContext, PictureCompositeMode, PicturePrimitive, PictureSurface};
use prim_store::{BrushKind, BrushPrimitive, BrushSegmentTaskId, DeferredResolve};
use prim_store::{EdgeAaSegmentMask, ImageSource, PrimitiveIndex};
use prim_store::{EdgeAaSegmentMask, ImageSource};
use prim_store::{VisibleGradientTile, PrimitiveInstance};
use prim_store::{BrushSegment, BorderSource, Primitive, PrimitiveDetails};
use render_task::{RenderTaskAddress, RenderTaskId, RenderTaskTree};
@ -127,7 +127,7 @@ pub struct AlphaBatchList {
pub batches: Vec<PrimitiveBatch>,
pub item_rects: Vec<Vec<WorldRect>>,
current_batch_index: usize,
current_prim_index: PrimitiveIndex,
current_z_id: ZBufferId,
}
impl AlphaBatchList {
@ -135,7 +135,7 @@ impl AlphaBatchList {
AlphaBatchList {
batches: Vec::new(),
item_rects: Vec::new(),
current_prim_index: PrimitiveIndex(usize::MAX),
current_z_id: ZBufferId::invalid(),
current_batch_index: usize::MAX,
}
}
@ -144,9 +144,9 @@ impl AlphaBatchList {
&mut self,
key: BatchKey,
bounding_rect: &WorldRect,
prim_index: PrimitiveIndex,
z_id: ZBufferId,
) -> &mut Vec<PrimitiveInstanceData> {
if prim_index != self.current_prim_index ||
if z_id != self.current_z_id ||
self.current_batch_index == usize::MAX ||
!self.batches[self.current_batch_index].key.is_compatible_with(&key) {
let mut selected_batch_index = None;
@ -199,7 +199,7 @@ impl AlphaBatchList {
self.current_batch_index = selected_batch_index.unwrap();
self.item_rects[self.current_batch_index].push(*bounding_rect);
self.current_prim_index = prim_index;
self.current_z_id = z_id;
}
&mut self.batches[self.current_batch_index].instances
@ -297,7 +297,7 @@ impl BatchList {
&mut self,
key: BatchKey,
bounding_rect: &WorldRect,
prim_index: PrimitiveIndex,
z_id: ZBufferId,
instance: PrimitiveInstanceData,
) {
match key.blend_mode {
@ -313,7 +313,7 @@ impl BatchList {
BlendMode::SubpixelWithBgColor |
BlendMode::SubpixelDualSource => {
self.alpha_batch_list
.set_params_and_get_batch(key, bounding_rect, prim_index)
.set_params_and_get_batch(key, bounding_rect, z_id)
.push(instance);
}
}
@ -323,7 +323,7 @@ impl BatchList {
&mut self,
key: BatchKey,
bounding_rect: &WorldRect,
prim_index: PrimitiveIndex,
z_id: ZBufferId,
) -> &mut Vec<PrimitiveInstanceData> {
match key.blend_mode {
BlendMode::None => {
@ -337,7 +337,7 @@ impl BatchList {
BlendMode::SubpixelWithBgColor |
BlendMode::SubpixelDualSource => {
self.alpha_batch_list
.set_params_and_get_batch(key, bounding_rect, prim_index)
.set_params_and_get_batch(key, bounding_rect, z_id)
}
}
}
@ -475,6 +475,7 @@ impl AlphaBatchBuilder {
prim_headers: &mut PrimitiveHeaders,
transforms: &mut TransformPalette,
root_spatial_node_index: SpatialNodeIndex,
z_generator: &mut ZBufferIdGenerator,
) {
let task_address = render_tasks.get_task_address(task_id);
@ -491,6 +492,7 @@ impl AlphaBatchBuilder {
prim_headers,
transforms,
root_spatial_node_index,
z_generator,
);
}
}
@ -511,6 +513,7 @@ impl AlphaBatchBuilder {
prim_headers: &mut PrimitiveHeaders,
transforms: &mut TransformPalette,
root_spatial_node_index: SpatialNodeIndex,
z_generator: &mut ZBufferIdGenerator,
) {
let prim = &ctx.prim_store.primitives[prim_instance.prim_index.0];
@ -535,6 +538,7 @@ impl AlphaBatchBuilder {
let bounding_rect = prim_instance.clipped_world_rect
.as_ref()
.expect("bug");
let z_id = z_generator.next();
// If the primitive is internally decomposed into multiple sub-primitives we may not
// use some of the per-primitive data and get it from each sub-primitive instead.
@ -593,7 +597,6 @@ impl AlphaBatchBuilder {
match picture.context_3d {
// Convert all children of the 3D hierarchy root into batches.
Picture3DContext::In { root_data: Some(ref list), .. } => {
let z = prim_headers.z_generator.next();
for child in list {
let prim_instance = &picture.prim_instances[child.anchor];
let pic_primitive = &ctx.prim_store.primitives[prim_instance.prim_index.0];
@ -637,7 +640,7 @@ impl AlphaBatchBuilder {
gpu_cache,
);
let prim_header_index = prim_headers.push(&prim_header, [
let prim_header_index = prim_headers.push(&prim_header, z_id, [
uv_rect_address.as_int(),
0,
0,
@ -652,13 +655,13 @@ impl AlphaBatchBuilder {
let instance = SplitCompositeInstance::new(
prim_header_index,
child.gpu_address,
z,
z_id,
);
self.batch_list.push_single_instance(
key,
&prim_instance.clipped_world_rect.as_ref().expect("bug"),
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(instance),
);
}
@ -694,7 +697,7 @@ impl AlphaBatchBuilder {
non_segmented_blend_mode,
textures,
);
let prim_header_index = prim_headers.push(&prim_header, [
let prim_header_index = prim_headers.push(&prim_header, z_id, [
ShaderColorMode::Image as i32,
RasterizationSpace::Screen as i32,
0,
@ -712,7 +715,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
key,
bounding_rect,
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(instance),
);
}
@ -756,7 +759,10 @@ impl AlphaBatchBuilder {
// Get the GPU cache address of the extra data handle.
let shadow_prim_address = gpu_cache.get_address(&picture.extra_gpu_data_handle);
let content_prim_header_index = prim_headers.push(&prim_header, [
let z_id_shadow = z_id;
let z_id_content = z_generator.next();
let content_prim_header_index = prim_headers.push(&prim_header, z_id_content, [
ShaderColorMode::Image as i32,
RasterizationSpace::Screen as i32,
0,
@ -772,7 +778,7 @@ impl AlphaBatchBuilder {
..prim_header
};
let shadow_prim_header_index = prim_headers.push(&shadow_prim_header, [
let shadow_prim_header_index = prim_headers.push(&shadow_prim_header, z_id_shadow, [
ShaderColorMode::Alpha as i32,
RasterizationSpace::Screen as i32,
0,
@ -799,14 +805,14 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
shadow_key,
bounding_rect,
prim_instance.prim_index,
z_id_shadow,
PrimitiveInstanceData::from(shadow_instance),
);
self.batch_list.push_single_instance(
content_key,
bounding_rect,
prim_instance.prim_index,
z_id_content,
PrimitiveInstanceData::from(content_instance),
);
}
@ -866,7 +872,7 @@ impl AlphaBatchBuilder {
textures,
);
let prim_header_index = prim_headers.push(&prim_header, [
let prim_header_index = prim_headers.push(&prim_header, z_id, [
uv_rect_address.as_int(),
filter_mode,
user_data,
@ -884,7 +890,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
key,
bounding_rect,
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(instance),
);
}
@ -907,7 +913,7 @@ impl AlphaBatchBuilder {
);
let backdrop_task_address = render_tasks.get_task_address(backdrop_id);
let source_task_address = render_tasks.get_task_address(cache_task_id);
let prim_header_index = prim_headers.push(&prim_header, [
let prim_header_index = prim_headers.push(&prim_header, z_id, [
mode as u32 as i32,
backdrop_task_address.0 as i32,
source_task_address.0 as i32,
@ -925,7 +931,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
key,
bounding_rect,
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(instance),
);
}
@ -943,7 +949,7 @@ impl AlphaBatchBuilder {
let uv_rect_address = render_tasks[cache_task_id]
.get_texture_address(gpu_cache)
.as_int();
let prim_header_index = prim_headers.push(&prim_header, [
let prim_header_index = prim_headers.push(&prim_header, z_id, [
ShaderColorMode::Image as i32,
RasterizationSpace::Screen as i32,
0,
@ -961,7 +967,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
key,
bounding_rect,
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(instance),
);
}
@ -980,6 +986,7 @@ impl AlphaBatchBuilder {
prim_headers,
transforms,
root_spatial_node_index,
z_generator,
);
}
}
@ -999,10 +1006,9 @@ impl AlphaBatchBuilder {
local_clip_rect: tile.local_clip_rect,
..prim_header
};
let prim_header_index = prim_headers.push(&prim_header, user_data);
let prim_header_index = prim_headers.push(&prim_header, z_id, user_data);
self.add_image_tile_to_batch(
prim_instance,
batch_kind,
specified_blend_mode,
textures,
@ -1011,13 +1017,13 @@ impl AlphaBatchBuilder {
bounding_rect,
tile.edge_flags,
uv_rect_address,
z_id,
);
}
}
}
BrushKind::LinearGradient { ref stops_handle, ref visible_tiles, .. } if !visible_tiles.is_empty() => {
add_gradient_tiles(
prim_instance,
visible_tiles,
stops_handle,
BrushBatchKind::LinearGradient,
@ -1028,11 +1034,11 @@ impl AlphaBatchBuilder {
&mut self.batch_list,
&prim_header,
prim_headers,
z_id,
);
}
BrushKind::RadialGradient { ref stops_handle, ref visible_tiles, .. } if !visible_tiles.is_empty() => {
add_gradient_tiles(
prim_instance,
visible_tiles,
stops_handle,
BrushBatchKind::RadialGradient,
@ -1043,6 +1049,7 @@ impl AlphaBatchBuilder {
&mut self.batch_list,
&prim_header,
prim_headers,
z_id,
);
}
_ => {
@ -1052,7 +1059,7 @@ impl AlphaBatchBuilder {
deferred_resolves,
ctx.prim_store.chase_id == Some(prim_instance.prim_index),
) {
let prim_header_index = prim_headers.push(&prim_header, params.prim_user_data);
let prim_header_index = prim_headers.push(&prim_header, z_id, params.prim_user_data);
if cfg!(debug_assertions) && ctx.prim_store.chase_id == Some(prim_instance.prim_index) {
println!("\t{:?} {:?}, task relative bounds {:?}",
params.batch_kind, prim_header_index, bounding_rect);
@ -1069,6 +1076,7 @@ impl AlphaBatchBuilder {
bounding_rect,
transform_kind,
render_tasks,
z_id,
);
}
}
@ -1146,7 +1154,7 @@ impl AlphaBatchBuilder {
}
};
let prim_header_index = prim_headers.push(&prim_header, [0; 3]);
let prim_header_index = prim_headers.push(&prim_header, z_id, [0; 3]);
let key = BatchKey::new(kind, blend_mode, textures);
let base_instance = GlyphInstance::new(
prim_header_index,
@ -1154,7 +1162,7 @@ impl AlphaBatchBuilder {
let batch = alpha_batch_list.set_params_and_get_batch(
key,
bounding_rect,
prim_instance.prim_index,
z_id,
);
for glyph in glyphs {
@ -1173,7 +1181,6 @@ impl AlphaBatchBuilder {
fn add_image_tile_to_batch(
&mut self,
prim_instance: &PrimitiveInstance,
batch_kind: BrushBatchKind,
blend_mode: BlendMode,
textures: BatchTextures,
@ -1182,6 +1189,7 @@ impl AlphaBatchBuilder {
bounding_rect: &WorldRect,
edge_flags: EdgeAaSegmentMask,
uv_rect_address: GpuCacheAddress,
z_id: ZBufferId,
) {
let base_instance = BrushInstance {
prim_header_index,
@ -1200,7 +1208,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
batch_key,
bounding_rect,
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(base_instance),
);
}
@ -1218,6 +1226,7 @@ impl AlphaBatchBuilder {
bounding_rect: &WorldRect,
transform_kind: TransformedRectKind,
render_tasks: &RenderTaskTree,
z_id: ZBufferId,
) {
let clip_task_address = match segment.clip_task_id {
BrushSegmentTaskId::RenderTaskId(id) =>
@ -1257,7 +1266,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
batch_key,
bounding_rect,
prim_instance.prim_index,
z_id,
instance,
);
}
@ -1275,6 +1284,7 @@ impl AlphaBatchBuilder {
bounding_rect: &WorldRect,
transform_kind: TransformedRectKind,
render_tasks: &RenderTaskTree,
z_id: ZBufferId,
) {
match (&brush.segment_desc, &params.segment_data) {
(Some(ref segment_desc), SegmentDataKind::Instanced(ref segment_data)) => {
@ -1296,6 +1306,7 @@ impl AlphaBatchBuilder {
bounding_rect,
transform_kind,
render_tasks,
z_id,
);
}
}
@ -1316,6 +1327,7 @@ impl AlphaBatchBuilder {
bounding_rect,
transform_kind,
render_tasks,
z_id,
);
}
}
@ -1337,7 +1349,7 @@ impl AlphaBatchBuilder {
self.batch_list.push_single_instance(
batch_key,
bounding_rect,
prim_instance.prim_index,
z_id,
PrimitiveInstanceData::from(instance),
);
}
@ -1351,7 +1363,6 @@ impl AlphaBatchBuilder {
}
fn add_gradient_tiles(
prim_instance: &PrimitiveInstance,
visible_tiles: &[VisibleGradientTile],
stops_handle: &GpuCacheHandle,
kind: BrushBatchKind,
@ -1362,6 +1373,7 @@ fn add_gradient_tiles(
batch_list: &mut BatchList,
base_prim_header: &PrimitiveHeader,
prim_headers: &mut PrimitiveHeaders,
z_id: ZBufferId,
) {
let batch = batch_list.set_params_and_get_batch(
BatchKey {
@ -1370,7 +1382,7 @@ fn add_gradient_tiles(
textures: BatchTextures::no_texture(),
},
bounding_rect,
prim_instance.prim_index,
z_id,
);
let user_data = [stops_handle.as_int(gpu_cache), 0, 0];
@ -1382,7 +1394,7 @@ fn add_gradient_tiles(
local_clip_rect: tile.local_clip_rect,
..*base_prim_header
};
let prim_header_index = prim_headers.push(&prim_header, user_data);
let prim_header_index = prim_headers.push(&prim_header, z_id, user_data);
batch.push(PrimitiveInstanceData::from(
BrushInstance {

5
gfx/webrender/src/frame_builder.rs
Просмотреть файл

@ -9,7 +9,7 @@ use clip::{ClipDataStore, ClipStore};
use clip_scroll_tree::{ClipScrollTree, ROOT_SPATIAL_NODE_INDEX, SpatialNodeIndex};
use display_list_flattener::{DisplayListFlattener};
use gpu_cache::GpuCache;
use gpu_types::{PrimitiveHeaders, TransformPalette, UvRectKind};
use gpu_types::{PrimitiveHeaders, TransformPalette, UvRectKind, ZBufferIdGenerator};
use hit_test::{HitTester, HitTestingRun};
use internal_types::{FastHashMap, PlaneSplitter};
use picture::{PictureCompositeMode, PictureSurface, RasterConfig};
@ -380,6 +380,8 @@ impl FrameBuilder {
let mut deferred_resolves = vec![];
let mut has_texture_cache_tasks = false;
let mut prim_headers = PrimitiveHeaders::new();
// Used to generated a unique z-buffer value per primitive.
let mut z_generator = ZBufferIdGenerator::new();
let use_dual_source_blending = self.config.dual_source_blending_is_enabled &&
self.config.dual_source_blending_is_supported;
@ -401,6 +403,7 @@ impl FrameBuilder {
&self.clip_store,
&mut transform_palette,
&mut prim_headers,
&mut z_generator,
);
if let RenderPassKind::OffScreen { ref texture_cache, .. } = pass.kind {

15
gfx/webrender/src/gpu_types.rs
Просмотреть файл

@ -12,16 +12,23 @@ use gpu_cache::{GpuCacheAddress, GpuDataRequest};
use internal_types::FastHashMap;
use prim_store::EdgeAaSegmentMask;
use render_task::RenderTaskAddress;
use std::i32;
use util::{TransformedRectKind, MatrixHelpers};
// Contains type that must exactly match the same structures declared in GLSL.
#[derive(Copy, Clone, Debug)]
#[derive(Copy, Clone, Debug, PartialEq)]
#[repr(C)]
#[cfg_attr(feature = "capture", derive(Serialize))]
#[cfg_attr(feature = "replay", derive(Deserialize))]
pub struct ZBufferId(i32);
impl ZBufferId {
pub fn invalid() -> Self {
ZBufferId(i32::MAX)
}
}
#[derive(Debug)]
#[cfg_attr(feature = "capture", derive(Serialize))]
#[cfg_attr(feature = "replay", derive(Deserialize))]
@ -167,8 +174,6 @@ pub struct PrimitiveHeaders {
pub headers_int: Vec<PrimitiveHeaderI>,
// The float-type headers for a primitive.
pub headers_float: Vec<PrimitiveHeaderF>,
// Used to generated a unique z-buffer value per primitive.
pub z_generator: ZBufferIdGenerator,
}
impl PrimitiveHeaders {
@ -176,7 +181,6 @@ impl PrimitiveHeaders {
PrimitiveHeaders {
headers_int: Vec::new(),
headers_float: Vec::new(),
z_generator: ZBufferIdGenerator::new(),
}
}
@ -184,6 +188,7 @@ impl PrimitiveHeaders {
pub fn push(
&mut self,
prim_header: &PrimitiveHeader,
z: ZBufferId,
user_data: [i32; 3],
) -> PrimitiveHeaderIndex {
debug_assert_eq!(self.headers_int.len(), self.headers_float.len());
@ -195,7 +200,7 @@ impl PrimitiveHeaders {
});
self.headers_int.push(PrimitiveHeaderI {
z: self.z_generator.next(),
z,
task_address: prim_header.task_address,
specific_prim_address: prim_header.specific_prim_address.as_int(),
clip_task_address: prim_header.clip_task_address,

11
gfx/webrender/src/tiling.rs
Просмотреть файл

@ -13,7 +13,7 @@ use device::{FrameId, Texture};
use euclid::{TypedPoint2D, TypedVector2D};
use gpu_cache::{GpuCache};
use gpu_types::{BorderInstance, BlurDirection, BlurInstance, PrimitiveHeaders, ScalingInstance};
use gpu_types::{TransformData, TransformPalette};
use gpu_types::{TransformData, TransformPalette, ZBufferIdGenerator};
use internal_types::{CacheTextureId, FastHashMap, SavedTargetIndex, TextureSource};
#[cfg(feature = "pathfinder")]
use pathfinder_partitioner::mesh::Mesh;
@ -124,6 +124,7 @@ pub trait RenderTarget {
_deferred_resolves: &mut Vec<DeferredResolve>,
_prim_headers: &mut PrimitiveHeaders,
_transforms: &mut TransformPalette,
_z_generator: &mut ZBufferIdGenerator,
) {
}
@ -217,6 +218,7 @@ impl<T: RenderTarget> RenderTargetList<T> {
saved_index: Option<SavedTargetIndex>,
prim_headers: &mut PrimitiveHeaders,
transforms: &mut TransformPalette,
z_generator: &mut ZBufferIdGenerator,
) {
debug_assert_eq!(None, self.saved_index);
self.saved_index = saved_index;
@ -229,6 +231,7 @@ impl<T: RenderTarget> RenderTargetList<T> {
deferred_resolves,
prim_headers,
transforms,
z_generator,
);
}
}
@ -399,6 +402,7 @@ impl RenderTarget for ColorRenderTarget {
deferred_resolves: &mut Vec<DeferredResolve>,
prim_headers: &mut PrimitiveHeaders,
transforms: &mut TransformPalette,
z_generator: &mut ZBufferIdGenerator,
) {
let mut merged_batches = AlphaBatchContainer::new(None);
@ -427,6 +431,7 @@ impl RenderTarget for ColorRenderTarget {
prim_headers,
transforms,
pic_task.root_spatial_node_index,
z_generator,
);
if let Some(batch_container) = batch_builder.build(&mut merged_batches) {
@ -895,6 +900,7 @@ impl RenderPass {
clip_store: &ClipStore,
transforms: &mut TransformPalette,
prim_headers: &mut PrimitiveHeaders,
z_generator: &mut ZBufferIdGenerator,
) {
profile_scope!("RenderPass::build");
@ -919,6 +925,7 @@ impl RenderPass {
deferred_resolves,
prim_headers,
transforms,
z_generator,
);
}
RenderPassKind::OffScreen { ref mut color, ref mut alpha, ref mut texture_cache } => {
@ -1023,6 +1030,7 @@ impl RenderPass {
saved_color,
prim_headers,
transforms,
z_generator,
);
alpha.build(
ctx,
@ -1032,6 +1040,7 @@ impl RenderPass {
saved_alpha,
prim_headers,
transforms,
z_generator,
);
}
}

2
gfx/webrender_bindings/revision.txt
Просмотреть файл

@ -1 +1 @@
9b1a2f7e46cfb3496d43421b828543b08bb45810
a8817b943a2fd0038307a7432fdf5cbccf4a943e