Bug 1908834 - Support outset box-shadows with quad based rendering r=…

…gfx-reviewers,lsalzman This initial patch does not contain any of the more subtle or complex optimizations that we'll land as follow ups, and thus only enables the new path for a subset of box-shadow primitives. Differential Revision: https://phabricator.services.mozilla.com/D217060
servo · Aug 12, 2024 · 83fb97d · 83fb97d
1 parent 8dbcd81
commit 83fb97d
Show file tree

Hide file tree

Showing 15 changed files with 637 additions and 192 deletions.
diff --git a/webrender/src/batch.rs b/webrender/src/batch.rs
@@ -829,18 +829,14 @@ impl BatchBuilder {
             PrimitiveCommand::Instance { prim_instance_index, gpu_buffer_address } => {
                 (prim_instance_index, Some(gpu_buffer_address.as_int()))
             }
-            PrimitiveCommand::Quad { pattern, pattern_input, prim_instance_index, gpu_buffer_address, quad_flags, edge_flags, transform_id } => {
+            PrimitiveCommand::Quad { pattern, pattern_input, prim_instance_index, gpu_buffer_address, quad_flags, edge_flags, transform_id, src_color_task_id } => {
                 let prim_instance = &prim_instances[prim_instance_index.0 as usize];
                 let prim_info = &prim_instance.vis;
                 let bounding_rect = &prim_info.clip_chain.pic_coverage_rect;
                 let render_task_address = self.batcher.render_task_address;
 
                 if segments.is_empty() {
                     let z_id = z_generator.next();
-                    // TODO: Some pattern types will sample from render tasks.
-                    // At the moment quads only use a render task as source for
-                    // segments which have been pre-rendered and masked.
-                    let src_color_task_id = RenderTaskId::INVALID;
 
                     quad::add_to_batch(
                         *pattern,
@@ -851,7 +847,7 @@ impl BatchBuilder {
                         *quad_flags,
                         *edge_flags,
                         INVALID_SEGMENT_INDEX as u8,
-                        src_color_task_id,
+                        *src_color_task_id,
                         z_id,
                         render_tasks,
                         gpu_buffer_builder,

diff --git a/webrender/src/border.rs b/webrender/src/border.rs
@@ -175,24 +175,28 @@ pub fn ensure_no_corner_overlap(
     let bottom_right_radius = &mut radius.bottom_right;
     let bottom_left_radius = &mut radius.bottom_left;
 
-    let sum = top_left_radius.width + top_right_radius.width;
-    if size.width < sum {
-        ratio = f32::min(ratio, size.width / sum);
-    }
+    if size.width > 0.0 {
+        let sum = top_left_radius.width + top_right_radius.width;
+        if size.width < sum {
+            ratio = f32::min(ratio, size.width / sum);
+        }
 
-    let sum = bottom_left_radius.width + bottom_right_radius.width;
-    if size.width < sum {
-        ratio = f32::min(ratio, size.width / sum);
+        let sum = bottom_left_radius.width + bottom_right_radius.width;
+        if size.width < sum {
+            ratio = f32::min(ratio, size.width / sum);
+        }
     }
 
-    let sum = top_left_radius.height + bottom_left_radius.height;
-    if size.height < sum {
-        ratio = f32::min(ratio, size.height / sum);
-    }
+    if size.height > 0.0 {
+        let sum = top_left_radius.height + bottom_left_radius.height;
+        if size.height < sum {
+            ratio = f32::min(ratio, size.height / sum);
+        }
 
-    let sum = top_right_radius.height + bottom_right_radius.height;
-    if size.height < sum {
-        ratio = f32::min(ratio, size.height / sum);
+        let sum = top_right_radius.height + bottom_right_radius.height;
+        if size.height < sum {
+            ratio = f32::min(ratio, size.height / sum);
+        }
     }
 
     if ratio < 1. {