Early mask-based culling, plus rebasing onto master

Author: kvark

webrender/src/internal_types.rs

@@ -223,14 +223,12 @@ impl TextureSampler {
 #[derive(Copy, Clone, Debug)]
 pub struct BatchTextures {
     pub colors: [SourceTexture; 3],
-    pub mask: SourceTexture,
 }
 
 impl BatchTextures {
     pub fn no_texture() -> Self {
         BatchTextures {
             colors: [SourceTexture::Invalid; 3],
-            mask: SourceTexture::Invalid,
         }
     }
 }

webrender/src/prim_store.rs

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use app_units::Au;
-use device::TextureId;
 use euclid::{Point2D, Matrix4D, Rect, Size2D};
 use gpu_store::{GpuStore, GpuStoreAddress};
 use internal_types::{device_pixel, DeviceRect, DeviceSize, SourceTexture};

webrender/src/renderer.rs

@@ -1131,8 +1131,9 @@ impl Renderer {
                                 &projection);
         }
         // draw image masks
-        for (&mask_texture_id, items) in target.clip_batcher.images.iter() {
-            self.device.bind_texture(TextureSampler::Mask, mask_texture_id);
+        for (mask_texture_id, items) in target.clip_batcher.images.iter() {
+            let texture_id = self.resolve_source_texture(mask_texture_id);
+            self.device.bind_texture(TextureSampler::Mask, texture_id);
             let shader = self.cs_clip_image.get(&mut self.device);
             self.draw_ubo_batch(items,
                                 shader,

webrender/src/tiling.rs

@@ -4,7 +4,6 @@
 
 use app_units::Au;
 use batch_builder::BorderSideHelpers;
-use device::{TextureId};
 use euclid::{Point2D, Point4D, Rect, Matrix4D, Size2D};
 use fnv::FnvHasher;
 use frame::FrameId;
@@ -152,18 +151,19 @@ impl AlphaBatchHelpers for PrimitiveStore {
                          device_pixel_ratio: f32) -> bool {
         let metadata = self.get_metadata(prim_index);
 
+        // bail out if the clip rectangle is outside of the tile
+        if let Some(ref clip_info) = metadata.clip_cache_info {
+            if !clip_info.device_rect.intersects(tile_rect) {
+                return false;
+            }
+        }
+
         match metadata.prim_kind {
             PrimitiveKind::Rectangle |
             PrimitiveKind::TextRun |
             PrimitiveKind::Image |
             PrimitiveKind::Gradient |
-            PrimitiveKind::BoxShadow => {
-                if let Some(ref clip_info) = metadata.clip_cache_info {
-                    clip_info.device_rect.intersects(tile_rect)
-                } else {
-                    true
-                }
-            }
+            PrimitiveKind::BoxShadow => true,
             PrimitiveKind::Border => {
                 let border = &self.cpu_borders[metadata.cpu_prim_index.0];
                 let inner_rect = TransformedRect::new(&border.inner_rect,
@@ -589,7 +589,7 @@ impl AlphaBatcher {
 pub struct ClipBatcher {
     pub clears: Vec<CacheClipInstance>,
     pub rectangles: Vec<CacheClipInstance>,
-    pub images: HashMap<TextureId, Vec<CacheClipInstance>>,
+    pub images: HashMap<SourceTexture, Vec<CacheClipInstance>>,
 }
 
 impl ClipBatcher {
@@ -1729,13 +1729,9 @@ impl ScreenTile {
 
                     // Add a task to render the updated image mask
                     if let Some(ref clip_info) = prim_metadata.clip_cache_info {
-                        if let Some(mask_task) = RenderTask::new_mask(self.rect, clip_info) {
-                            current_task.children.push(mask_task);
-                        } else {
-                            // The primitive has clip items but their intersection is empty
-                            // meaning, no pixels will be visible, we can skip it entirely
-                            continue;
-                        }
+                        let mask_task = RenderTask::new_mask(self.rect, clip_info)
+                                                   .expect("Primitive should have been culled by `prim_affects_tile` alread");
+                        current_task.children.push(mask_task);
                     }
 
                     // Add any dynamic render tasks needed to render this primitive