Bug 1513683 - Update webrender to commit bf98e0cbde3ac885f55ff536ace139e1dc4f080f (WR PR #3396). r=kats
authorWR Updater Bot <graphics-team@mozilla.staktrace.com>
Wed, 12 Dec 2018 20:38:19 +0000
changeset 507428 17e190ab55193475981c1121158564422c1a6c15
parent 507427 9e526b3093ee60791cf9c436ea06b6665eb5ef74
child 507429 995a65365aa1b925ba740380e055cda335689e85
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1513683
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1513683 - Update webrender to commit bf98e0cbde3ac885f55ff536ace139e1dc4f080f (WR PR #3396). r=kats https://github.com/servo/webrender/pull/3396 Differential Revision: https://phabricator.services.mozilla.com/D14311
gfx/webrender_bindings/revision.txt
gfx/wr/webrender/src/batch.rs
gfx/wr/webrender/src/picture.rs
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1,1 +1,1 @@
-6f993ede3a062777d3067006537bab140702b669
+bf98e0cbde3ac885f55ff536ace139e1dc4f080f
--- a/gfx/wr/webrender/src/batch.rs
+++ b/gfx/wr/webrender/src/batch.rs
@@ -1035,17 +1035,17 @@ impl AlphaBatchBuilder {
                                         ]);
 
                                         let cache_item = ctx
                                             .resource_cache
                                             .get_texture_cache_item(&tile.handle);
 
                                         let key = BatchKey::new(
                                             kind,
-                                            non_segmented_blend_mode,
+                                            BlendMode::None,
                                             BatchTextures::color(cache_item.texture_id),
                                         );
 
                                         let uv_rect_address = gpu_cache
                                             .get_address(&cache_item.uv_rect_handle)
                                             .as_int();
 
                                         let instance = BrushInstance {
--- a/gfx/wr/webrender/src/picture.rs
+++ b/gfx/wr/webrender/src/picture.rs
@@ -2184,21 +2184,25 @@ impl PicturePrimitive {
                 let tile_cache = self.tile_cache.as_mut().unwrap();
 
                 // Build the render task for a tile cache picture, if there is
                 // any dirty rect.
 
                 match tile_cache.dirty_region {
                     Some(ref dirty_region) => {
                         // Texture cache descriptor for each tile.
+                        // TODO(gw): If / when we start to use tile caches with
+                        //           clip masks and/or transparent backgrounds,
+                        //           we will need to correctly select an opacity
+                        //           here and a blend mode in batch.rs.
                         let descriptor = ImageDescriptor::new(
                             TILE_SIZE_DP,
                             TILE_SIZE_DP,
                             ImageFormat::BGRA8,
-                            false,          // TODO(gw): Detect when background color is opaque!
+                            true,
                             false,
                         );
 
                         // Get a picture rect, expanded to tile boundaries.
                         let p0 = pic_rect.origin;
                         let p1 = pic_rect.bottom_right();
                         let local_tile_size = tile_cache.local_tile_size;
                         let aligned_pic_rect = PictureRect::from_floats(