Skip to content

Commit 8fb913c

Browse files
marco-cmarco-c
committed
Bug 1580677 - Update plane-split dependency to 0.15.0 r=nical
Differential Revision: https://phabricator.services.mozilla.com/D45628 UltraBlame original commit: 3d8395b2ab35b3ed3498d81fc156fc2d13cafb67
1 parent 07c0756 commit 8fb913c

File tree

16 files changed

+436
-162
lines changed

16 files changed

+436
-162
lines changed

‎Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/wr/Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/wr/webrender/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,7 @@ split
385385
"
386386
0
387387
.
388-
14
389-
.
390-
1
388+
15
391389
"
392390
png
393391
=

‎gfx/wr/webrender/src/batch.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5008,6 +5008,8 @@ prim_instances
50085008
child
50095009
.
50105010
anchor
5011+
.
5012+
prim_instance_index
50115013
]
50125014
;
50135015
let

‎gfx/wr/webrender/src/internal_types.rs

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,60 @@ FxHasher
229229
>
230230
>
231231
;
232+
#
233+
[
234+
derive
235+
(
236+
Copy
237+
Clone
238+
Debug
239+
)
240+
]
241+
#
242+
[
243+
cfg_attr
244+
(
245+
feature
246+
=
247+
"
248+
capture
249+
"
250+
derive
251+
(
252+
Serialize
253+
)
254+
)
255+
]
256+
pub
257+
struct
258+
PlaneSplitAnchor
259+
{
260+
pub
261+
prim_instance_index
262+
:
263+
usize
264+
}
265+
impl
266+
Default
267+
for
268+
PlaneSplitAnchor
269+
{
270+
fn
271+
default
272+
(
273+
)
274+
-
275+
>
276+
Self
277+
{
278+
PlaneSplitAnchor
279+
{
280+
prim_instance_index
281+
:
282+
0
283+
}
284+
}
285+
}
232286
pub
233287
type
234288
PlaneSplitter
@@ -237,6 +291,7 @@ BspSplitter
237291
<
238292
f64
239293
WorldPixel
294+
PlaneSplitAnchor
240295
>
241296
;
242297
const

‎gfx/wr/webrender/src/picture.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ FastHashMap
152152
FastHashSet
153153
PlaneSplitter
154154
Filter
155+
PlaneSplitAnchor
155156
}
156157
;
157158
use
@@ -9137,7 +9138,7 @@ OrderedPictureChild
91379138
pub
91389139
anchor
91399140
:
9140-
usize
9141+
PlaneSplitAnchor
91419142
pub
91429143
spatial_node_index
91439144
:
@@ -13430,7 +13431,7 @@ world_rect
1343013431
WorldRect
1343113432
plane_split_anchor
1343213433
:
13433-
usize
13434+
PlaneSplitAnchor
1343413435
)
1343513436
-
1343613437
>
@@ -13788,8 +13789,9 @@ vec3
1378813789
)
1378913790
{
1379013791
let
13791-
spatial_node_index
13792+
prim_instance
1379213793
=
13794+
&
1379313795
self
1379413796
.
1379513797
prim_list
@@ -13799,7 +13801,14 @@ prim_instances
1379913801
poly
1380013802
.
1380113803
anchor
13804+
.
13805+
prim_instance_index
1380213806
]
13807+
;
13808+
let
13809+
spatial_node_index
13810+
=
13811+
prim_instance
1380313812
.
1380413813
spatial_node_index
1380513814
;

‎gfx/wr/webrender/src/prim_store/mod.rs

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,15 @@ crate
247247
intern
248248
;
249249
use
250+
crate
251+
:
252+
:
253+
internal_types
254+
:
255+
:
256+
PlaneSplitAnchor
257+
;
258+
use
250259
malloc_size_of
251260
:
252261
:
@@ -11904,7 +11913,7 @@ mut
1190411913
FrameBuildingState
1190511914
plane_split_anchor
1190611915
:
11907-
usize
11916+
PlaneSplitAnchor
1190811917
data_stores
1190911918
:
1191011919
&
@@ -12369,7 +12378,7 @@ PrimitiveScratchBuffer
1236912378
{
1237012379
for
1237112380
(
12372-
plane_split_anchor
12381+
prim_instance_index
1237312382
prim_instance
1237412383
)
1237512384
in
@@ -12497,6 +12506,14 @@ frame_context
1249712506
clip_scroll_tree
1249812507
)
1249912508
;
12509+
let
12510+
plane_split_anchor
12511+
=
12512+
PlaneSplitAnchor
12513+
{
12514+
prim_instance_index
12515+
}
12516+
;
1250012517
if
1250112518
self
1250212519
.
@@ -12538,7 +12555,7 @@ mut
1253812555
PrimitiveInstance
1253912556
plane_split_anchor
1254012557
:
12541-
usize
12558+
PlaneSplitAnchor
1254212559
pic_context
1254312560
:
1254412561
&

‎gfx/wr/webrender/src/util.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6126,6 +6126,13 @@ match
61266126
Clipper
61276127
:
61286128
:
6129+
<
6130+
_
6131+
_
6132+
usize
6133+
>
6134+
:
6135+
:
61296136
frustum_planes
61306137
(
61316138
transform

‎third_party/rust/plane-split/.cargo-checksum.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ toml
1111
"
1212
:
1313
"
14-
224c30422b713d747e048697129f6988d2c97bb71a0b4ddf5e9bd6934a2843e3
14+
868408c94825c0f95dbe21fa82748313c26c62f3cc2d3ed7a162dec4f115b9f3
1515
"
1616
"
1717
LICENSE
@@ -49,7 +49,7 @@ rs
4949
"
5050
:
5151
"
52-
964182582d53a160a86809231c61ba6512f38dde14b83c42b8145ef782064d30
52+
34c92cff76488fea23bee209fed62eee2db8c9687991c6413605961782e1317e
5353
"
5454
"
5555
src
@@ -60,7 +60,7 @@ rs
6060
"
6161
:
6262
"
63-
16bba7f4bb79b7fb4c8b55403c3d51deb8365c4663314411318d99e98cecbaf4
63+
e9ac9102f85709336088f3887b53273958aa9b2505d7ab06ba9a3e1e720aa540
6464
"
6565
"
6666
src
@@ -71,7 +71,7 @@ rs
7171
"
7272
:
7373
"
74-
d2476985e1a28d227cf3b2f11ce3d16dca9a244d29aa7d3ee427439b903235a3
74+
62613b64dacbfcd4727c5ce57e09bd9289db5a678f86dfe8544f1efc0f3f62b0
7575
"
7676
"
7777
src
@@ -82,7 +82,7 @@ rs
8282
"
8383
:
8484
"
85-
305af53f5d9334a10481f32ff60729e43e8c497d563c72e926b67dd7b68a261e
85+
b8458d3c01dc06918b8410f363b19f15542522f1037cdd731f08b65e92a822bd
8686
"
8787
"
8888
tests
@@ -104,7 +104,7 @@ rs
104104
"
105105
:
106106
"
107-
238b0108b4605b8f7c77b2a886c9fb6ccb5ddc2644def166afb4eaedaec3a7c7
107+
f6dbeb9fedf1e1dafe6d0112845fbafe361ea96607933e37f26db3b7885023bb
108108
"
109109
"
110110
tests
@@ -115,14 +115,14 @@ rs
115115
"
116116
:
117117
"
118-
f8f0784b9d2f1b3dbc0a0f25fc667ec3aa301b2ae4346f5b7ca0024c535570bc
118+
6a47ae030c7c95d3149c3710d651958922061bbdd923ee56762e07519f719344
119119
"
120120
}
121121
"
122122
package
123123
"
124124
:
125125
"
126-
68a117c887fbcd9af8dfc1b8b12ee19ba9dec0b2a91d0a9d2bd9114e459f9c78
126+
ffe16a646a08f4b4dd74035b9ff8e378eb1a4012a74f14f5889e7001cdbece33
127127
"
128128
}

‎third_party/rust/plane-split/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ version
122122
"
123123
0
124124
.
125-
14
125+
15
126126
.
127-
1
127+
0
128128
"
129129
authors
130130
=

0 commit comments

Comments
 (0)