Bug 1509302 - Update webrender to commit 29dab25c587b38ecbf4713cda44e…

…87b78846c7f6 (WR PR #3336). r=kats

servo/webrender#3336

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

UltraBlame original commit: 76fb27eae36a4c9b9c01b2a71de2b535cf3d3643

gfx/webrender/src/batch.rs

@@ -208,6 +208,7 @@ prim_store
 EdgeAaSegmentMask
 ImageSource
 PrimitiveInstanceKind
+PrimitiveStore
 }
 ;
 use
@@ -6625,8 +6626,7 @@ Image
 {
 alpha_type
 request
-ref
-opacity_binding
+opacity_binding_index
 ref
 visible_tiles
 .
@@ -6642,6 +6642,18 @@ is_empty
 =
 >
 {
+let
+opacity_binding
+=
+ctx
+.
+prim_store
+.
+get_opacity_binding
+(
+opacity_binding_index
+)
+;
 for
 tile
 in
@@ -6678,8 +6690,6 @@ alpha_type
 get_shader_opacity
 (
 opacity_binding
-.
-current
 )
 )
 {
@@ -6865,6 +6875,9 @@ resource_cache
 gpu_cache
 deferred_resolves
 prim_instance
+ctx
+.
+prim_store
 )
 {
 let
@@ -8340,6 +8353,10 @@ prim_instance
 :
 &
 PrimitiveInstance
+prim_store
+:
+&
+PrimitiveStore
 )
 -
 >
@@ -8362,8 +8379,7 @@ alpha_type
 request
 ref
 source
-ref
-opacity_binding
+opacity_binding_index
 .
 .
 }
@@ -8499,6 +8515,16 @@ cache_item
 texture_id
 )
 ;
+let
+opacity_binding
+=
+prim_store
+.
+get_opacity_binding
+(
+opacity_binding_index
+)
+;
 Some
 (
 BrushBatchParameters
@@ -8546,8 +8572,6 @@ i32
 get_shader_opacity
 (
 opacity_binding
-.
-current
 )
 ]
 cache_item
@@ -8871,14 +8895,23 @@ BrushKind
 :
 Solid
 {
-ref
-opacity_binding
+opacity_binding_index
 .
 .
 }
 =
 >
 {
+let
+opacity_binding
+=
+prim_store
+.
+get_opacity_binding
+(
+opacity_binding_index
+)
+;
 Some
 (
 BrushBatchParameters
@@ -8900,8 +8933,6 @@ no_texture
 get_shader_opacity
 (
 opacity_binding
-.
-current
 )
 0
 0

gfx/webrender/src/border.rs

@@ -167,12 +167,6 @@ RenderTaskCacheKeyKind
 }
 ;
 use
-smallvec
-:
-:
-SmallVec
-;
-use
 util
 :
 :
@@ -4042,13 +4036,9 @@ border_segments
 :
 &
 mut
-SmallVec
+Vec
 <
-[
 BorderSegmentInfo
-;
-8
-]
 >
 brush_segments
 :
@@ -5895,13 +5885,9 @@ border_segments
 :
 &
 mut
-SmallVec
+Vec
 <
-[
 BorderSegmentInfo
-;
-8
-]
 >
 do_aa
 :
@@ -6163,13 +6149,9 @@ border_segments
 :
 &
 mut
-SmallVec
+Vec
 <
-[
 BorderSegmentInfo
-;
-8
-]
 >
 do_aa
 :
@@ -6874,7 +6856,7 @@ let
 mut
 border_segments
 =
-SmallVec
+Vec
 :
 :
 new

gfx/webrender/src/display_list_flattener.rs

@@ -300,10 +300,10 @@ prim_store
 :
 :
 {
-OpacityBinding
 ScrollNodeAndClipChain
 PictureIndex
 register_prim_chase_id
+OpacityBindingIndex
 }
 ;
 use
@@ -10672,14 +10672,12 @@ Vec
 new
 (
 )
-opacity_binding
+opacity_binding_index
 :
-OpacityBinding
+OpacityBindingIndex
 :
 :
-new
-(
-)
+INVALID
 }
 None
 )