Skip to content

Use the brush shaders for repeated images/gradient in some cases. #2644

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Apr 27, 2018
Merged

Use the brush shaders for repeated images/gradient in some cases. #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bb9bc4
Repeat linear gradients in the brush shader when there is no spacing.
nical Apr 11, 2018
ab991d8
Repeat radial gradients in the brush shader when there is no spacing.
nical Apr 11, 2018
445e7a0
Repeat images in the brush shader when there is no spacing.
nical Apr 11, 2018
b92439c
Update reftest reference.
nical Apr 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions webrender/res/brush_radial_gradient.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ void brush_vs(
vRepeatedSize = local_rect.size / tile_repeat.xy;
vRepeatedSize.y *= ratio_xy;

vPos;

vGradientAddress = user_data.x;

// Whether to repeat the gradient instead of clamping.
Expand Down
137 changes: 76 additions & 61 deletions webrender/src/display_list_flattener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,6 +1843,7 @@ impl<'a> DisplayListFlattener<'a> {
stops_count: usize,
extend_mode: ExtendMode,
gradient_index: CachedGradientIndex,
stretch_size: LayoutSize,
) {
// Try to ensure that if the gradient is specified in reverse, then so long as the stops
// are also supplied in reverse that the rendered result will be equivalent. To do this,
Expand Down Expand Up @@ -1871,6 +1872,7 @@ impl<'a> DisplayListFlattener<'a> {
start_point: sp,
end_point: ep,
gradient_index,
stretch_size,
},
None,
);
Expand All @@ -1889,43 +1891,49 @@ impl<'a> DisplayListFlattener<'a> {
stops: ItemRange<GradientStop>,
stops_count: usize,
extend_mode: ExtendMode,
tile_size: LayoutSize,
stretch_size: LayoutSize,
tile_spacing: LayoutSize,
) {
let gradient_index = CachedGradientIndex(self.cached_gradients.len());
self.cached_gradients.push(CachedGradient::new());

let prim_infos = info.decompose(
tile_size,
tile_spacing,
64 * 64,
);

if prim_infos.is_empty() {
self.add_gradient_impl(
clip_and_scroll,
info,
start_point,
end_point,
stops,
stops_count,
extend_mode,
gradient_index,
if tile_spacing != LayoutSize::zero() {
let prim_infos = info.decompose(
stretch_size,
tile_spacing,
64 * 64,
);
} else {
for prim_info in prim_infos {
self.add_gradient_impl(
clip_and_scroll,
&prim_info,
start_point,
end_point,
stops,
stops_count,
extend_mode,
gradient_index,
);

if !prim_infos.is_empty() {
for prim_info in prim_infos {
self.add_gradient_impl(
clip_and_scroll,
&prim_info,
start_point,
end_point,
stops,
stops_count,
extend_mode,
gradient_index,
prim_info.rect.size,
);
}

return;
}
}

self.add_gradient_impl(
clip_and_scroll,
info,
start_point,
end_point,
stops,
stops_count,
extend_mode,
gradient_index,
stretch_size,
);
}

fn add_radial_gradient_impl(
Expand All @@ -1939,6 +1947,7 @@ impl<'a> DisplayListFlattener<'a> {
stops: ItemRange<GradientStop>,
extend_mode: ExtendMode,
gradient_index: CachedGradientIndex,
stretch_size: LayoutSize,
) {
let prim = BrushPrimitive::new(
BrushKind::RadialGradient {
Expand All @@ -1949,6 +1958,7 @@ impl<'a> DisplayListFlattener<'a> {
end_radius,
ratio_xy,
gradient_index,
stretch_size,
},
None,
);
Expand All @@ -1971,45 +1981,51 @@ impl<'a> DisplayListFlattener<'a> {
ratio_xy: f32,
stops: ItemRange<GradientStop>,
extend_mode: ExtendMode,
tile_size: LayoutSize,
stretch_size: LayoutSize,
tile_spacing: LayoutSize,
) {
let gradient_index = CachedGradientIndex(self.cached_gradients.len());
self.cached_gradients.push(CachedGradient::new());

let prim_infos = info.decompose(
tile_size,
tile_spacing,
64 * 64,
);

if prim_infos.is_empty() {
self.add_radial_gradient_impl(
clip_and_scroll,
info,
center,
start_radius,
end_radius,
ratio_xy,
stops,
extend_mode,
gradient_index,
if tile_spacing != LayoutSize::zero() {
let prim_infos = info.decompose(
stretch_size,
tile_spacing,
64 * 64,
);
} else {
for prim_info in prim_infos {
self.add_radial_gradient_impl(
clip_and_scroll,
&prim_info,
center,
start_radius,
end_radius,
ratio_xy,
stops,
extend_mode,
gradient_index,
);

if !prim_infos.is_empty() {
for prim_info in prim_infos {
self.add_radial_gradient_impl(
clip_and_scroll,
&prim_info,
center,
start_radius,
end_radius,
ratio_xy,
stops,
extend_mode,
gradient_index,
stretch_size,
);
}

return;
}
}

self.add_radial_gradient_impl(
clip_and_scroll,
info,
center,
start_radius,
end_radius,
ratio_xy,
stops,
extend_mode,
gradient_index,
stretch_size,
);
}

pub fn add_text(
Expand Down Expand Up @@ -2137,7 +2153,6 @@ impl<'a> DisplayListFlattener<'a> {
// See if conditions are met to run through the new
// image brush shader, which supports segments.
if tile_spacing == LayoutSize::zero() &&
stretch_size == info.rect.size &&
tile_offset.is_none() {
let prim = BrushPrimitive::new(
BrushKind::Image {
Expand Down
31 changes: 23 additions & 8 deletions webrender/src/prim_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ pub enum BrushKind {
start_radius: f32,
end_radius: f32,
ratio_xy: f32,
stretch_size: LayoutSize,
},
LinearGradient {
gradient_index: CachedGradientIndex,
Expand All @@ -285,6 +286,7 @@ pub enum BrushKind {
reverse_stops: bool,
start_point: LayoutPoint,
end_point: LayoutPoint,
stretch_size: LayoutSize,
}
}

Expand Down Expand Up @@ -1684,15 +1686,32 @@ impl PrimitiveStore {
PrimitiveKind::Brush => {
let brush = &self.cpu_brushes[metadata.cpu_prim_index.0];
brush.write_gpu_blocks(&mut request);

let repeat = match brush.kind {
BrushKind::Image { stretch_size, .. } |
BrushKind::LinearGradient { stretch_size, .. } |
BrushKind::RadialGradient { stretch_size, .. } => {
[
metadata.local_rect.size.width / stretch_size.width,
metadata.local_rect.size.height / stretch_size.height,
0.0,
0.0,
]
}
_ => {
[1.0, 1.0, 0.0, 0.0]
}
};

match brush.segment_desc {
Some(ref segment_desc) => {
for segment in &segment_desc.segments {
// has to match VECS_PER_SEGMENT
request.write_segment(segment.local_rect);
request.write_segment(segment.local_rect, repeat);
}
}
None => {
request.write_segment(metadata.local_rect);
request.write_segment(metadata.local_rect, repeat);
}
}
}
Expand Down Expand Up @@ -2462,13 +2481,9 @@ impl<'a> GpuDataRequest<'a> {
fn write_segment(
&mut self,
local_rect: LayoutRect,
extra_params: [f32; 4],
) {
self.push(local_rect);
self.push([
1.0,
1.0,
0.0,
0.0
]);
self.push(extra_params);
}
}
Binary file modified wrench/reftests/filters/blend-clipped.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion wrench/reftests/image/reftest.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
== very-big.yaml very-big-ref.yaml
== very-big-tile-size.yaml very-big-tile-size-ref.yaml
== tile-with-spacing.yaml tile-with-spacing-ref.yaml
fuzzy(1,250000) == tile-repeat-prim-or-decompose.yaml tile-repeat-prim-or-decompose-ref.yaml
fuzzy(1,331264) == tile-repeat-prim-or-decompose.yaml tile-repeat-prim-or-decompose-ref.yaml
platform(linux,mac) options(allow-mipmaps) == downscale.yaml downscale.png
== segments.yaml segments.png
platform(linux,mac) == yuv.yaml yuv.png
Binary file modified wrench/reftests/transforms/local-clip.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.