Glutin 0.21 #23288

paulrouget · 2019-04-29T12:37:50Z

Fix #23189

Depends on #23233

Dependencies update:

This change is

highfive · 2019-04-29T12:37:56Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/Cargo.toml
@wafflespeanut: python/servo/command_base.py, python/servo/testing_commands.py, python/servo/build_commands.py, python/servo/post_build_commands.py
@KiChjang: components/script/Cargo.toml
@edunham: servo-tidy.toml
@emilio: components/style/Cargo.toml, components/layout/Cargo.toml

highfive · 2019-04-29T12:37:58Z

Warning

These commits modify unsafe code. Please review it carefully!

components/canvas/Cargo.toml

bors-servo · 2019-04-29T21:17:25Z

☔ The latest upstream changes (presumably #23289) made this pull request unmergeable. Please resolve the merge conflicts.

Manishearth · 2019-04-30T00:26:25Z

Also depends on servo/rust-azure#298

Manishearth · 2019-04-30T00:50:46Z

Needs a bump of azure to v0.36.0

paulrouget · 2019-04-30T08:24:06Z

Running into a compilation issue with rand_core…

Manishearth · 2019-04-30T08:28:10Z

Probably because of the multiple rand packages conflicting

paulrouget · 2019-04-30T08:33:47Z

That was not an issue with the RC:

master...paulrouget:glutin-update-rc

Investigating.

paulrouget · 2019-04-30T08:42:51Z

error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
  --> /Users/paul/.cargo/registry/src/github.com-1ecc6299db9ec823/rand-0.6.5/src/rngs/std.rs:55:6
   |
55 | impl SeedableRng for StdRng {
   |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_hc::Hc128Rng`

error[E0277]: the trait bound `rand_chacha::ChaChaRng: rand_core::SeedableRng` is not satisfied
   --> /Users/paul/.cargo/registry/src/github.com-1ecc6299db9ec823/rand-0.6.5/src/deprecated.rs:141:6
    |
141 | impl SeedableRng for ChaChaRng {
    |      ^^^^^^^^^^^ the trait `rand_core::SeedableRng` is not implemented for `rand_chacha::ChaChaRng`

error[E0277]: the trait bound `rand_hc::Hc128Rng: rand_core::SeedableRng` is not satisfied
   --> /Users/paul/.cargo/registry/src/github.com-1ecc6299db9ec823/rand-0.6.5/src/deprecated.rs:198:6

and more like this.

jdm · 2019-04-30T12:12:38Z

When I've seen errors like that,bit usually requires updating an older version of the Rand package.

paulrouget · 2019-05-02T09:30:22Z

@jdm it worked. Thank you.

PR updated.

paulrouget · 2019-05-02T09:56:38Z

The way context are handled in this new version of glutin is a bit tricky.

A context is either current or not, and switching from one to the other consumes the context. So we can't simply store a context. See 76718f1#diff-7f61eab416c6c9fd2e6bfc9bb5b22f9bR22

paulrouget · 2019-05-02T10:04:07Z

@bors-servo try


        Auto merge of #23288 - paulrouget:glutin-21, r=<try>

Glutin 0.21 Fix #23189 Depends on #23233 Dependencies update: - servo/rust-webvr#73 - servo/skia#172 - servo/rust-glx#23 - servo/surfman#134  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23288)

bors-servo · 2019-05-02T13:35:34Z

⌛ Trying commit 76718f1 with merge d865a87...

paulrouget · 2019-05-02T13:36:47Z

Not ready for review. Need tries and servo/skia#175

paulrouget · 2019-05-02T14:53:19Z

@bors-servo try


        Auto merge of #23288 - paulrouget:glutin-21, r=<try>

Glutin 0.21 Fix #23189 Depends on #23233 Dependencies update: - servo/rust-webvr#73 - servo/skia#172 - servo/rust-glx#23 - servo/surfman#134  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23288)

bors-servo · 2019-05-02T14:53:30Z

⌛ Trying commit 1af3508 with merge 6f77968...

bors-servo · 2019-05-02T17:03:57Z

💔 Test failed - android-mac

bors-servo · 2019-05-21T11:26:42Z

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
State: approved= try=True

paulrouget · 2019-05-22T07:31:55Z

I'll see if we can land this with 2 versions of gl_generator (which won't require a mozangle update). And we will de-dupe once servo/mozangle#19 land.


        Glutin update: dependencies update


        Glutin update: ignore rand-core and nix duplicate


        Glutin update: ignore gl_generator duplicate


        Glutin update: new Context API

paulrouget · 2019-05-22T09:22:43Z

@bors-servo try=wpt

bors-servo · 2019-05-22T09:22:47Z

⌛ Trying commit d55d664 with merge b9b69df...


        Auto merge of #23288 - paulrouget:glutin-21, r=<try>

Glutin 0.21 Fix #23189 Depends on #23233 Dependencies update: - servo/rust-webvr#73 - servo/skia#172 - servo/rust-glx#23 - servo/surfman#134  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23288)

bors-servo · 2019-05-22T09:56:07Z

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
State: approved= try=True

paulrouget · 2019-05-22T10:03:15Z

All look green.

Need an approval for duplicating gl_generator, a r+, and we good to go.

jdm · 2019-05-22T11:57:33Z

@bors-servo r+

bors-servo · 2019-05-22T11:57:34Z

📌 Commit d55d664 has been approved by jdm

bors-servo · 2019-05-22T14:02:16Z

⌛ Testing commit d55d664 with merge a911b82...


        Auto merge of #23288 - paulrouget:glutin-21, r=jdm

Glutin 0.21 Fix #23189 Depends on #23233 Dependencies update: - servo/rust-webvr#73 - servo/skia#172 - servo/rust-glx#23 - servo/surfman#134  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23288)

bors-servo · 2019-05-22T16:29:07Z

☀️ Test successful - arm64, linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing a911b82 to master...


        Auto merge of #23457 - jdm:glutes, r=jdm

Glutin 0.21 This is just #23288 taking into account the lessons learned in #23448 so that Android builds successfully.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23457)

highfive assigned asajeffrey Apr 29, 2019

highfive added the S-awaiting-review label Apr 29, 2019

jdm approved these changes Apr 29, 2019

View changes

components/canvas/Cargo.toml Outdated Show resolved Hide resolved

highfive added the S-needs-rebase label Apr 29, 2019

jdm mentioned this pull request Apr 30, 2019

Update glutin to 0.21, webvr to 0.11.1 #23291

Closed

paulrouget force-pushed the paulrouget:glutin-21 branch from 21e284a to 9c8341b Apr 30, 2019

paulrouget force-pushed the paulrouget:glutin-21 branch from 9c8341b to 306f025 Apr 30, 2019

paulrouget force-pushed the paulrouget:glutin-21 branch from 306f025 to 76718f1 May 2, 2019

paulrouget changed the title ~~WIP: Glutin 0.21~~ Glutin 0.21 May 2, 2019

paulrouget mentioned this pull request May 2, 2019

Use new Glutin context API on Windows servo/skia#175

Merged

paulrouget force-pushed the paulrouget:glutin-21 branch from c3dc0f3 to ab4d659 May 22, 2019

paulrouget added 4 commits Apr 29, 2019

Glutin update: dependencies update

30fb18e

Glutin update: ignore rand-core and nix duplicate

da28a0c

Glutin update: ignore gl_generator duplicate

5bdb0da

Glutin update: new Context API

Loading status checks…

d55d664

paulrouget force-pushed the paulrouget:glutin-21 branch from ab4d659 to d55d664 May 22, 2019

highfive assigned jdm and unassigned asajeffrey May 22, 2019

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels May 22, 2019

highfive removed the S-awaiting-merge label May 22, 2019

paulrouget mentioned this pull request May 22, 2019

Un-dupe gl_generator #23441

Open

atouchet mentioned this pull request May 22, 2019

Crossbeam channels trigger valgrind errors #23077

Open

This was referenced May 25, 2019

Glutin upgrade investigations #23448

Closed

Glutin 0.21 #23457

Merged

servo / servo

Glutin 0.21 #23288

Glutin 0.21 #23288

paulrouget commented Apr 29, 2019 •

edited

highfive commented Apr 29, 2019

highfive commented Apr 29, 2019

bors-servo commented Apr 29, 2019

Manishearth commented Apr 30, 2019

Manishearth commented Apr 30, 2019

paulrouget commented Apr 30, 2019

Manishearth commented Apr 30, 2019

paulrouget commented Apr 30, 2019

paulrouget commented Apr 30, 2019

jdm commented Apr 30, 2019

paulrouget commented May 2, 2019

paulrouget commented May 2, 2019

paulrouget commented May 2, 2019

bors-servo commented May 2, 2019

paulrouget commented May 2, 2019

paulrouget commented May 2, 2019

bors-servo commented May 2, 2019

bors-servo commented May 2, 2019

bors-servo commented May 21, 2019

paulrouget commented May 22, 2019

paulrouget commented May 22, 2019

bors-servo commented May 22, 2019

bors-servo commented May 22, 2019

paulrouget commented May 22, 2019

jdm commented May 22, 2019

bors-servo commented May 22, 2019

bors-servo commented May 22, 2019

bors-servo commented May 22, 2019

servo / servo

Join GitHub today

Glutin 0.21 #23288

Glutin 0.21 #23288

Conversation

paulrouget commented Apr 29, 2019 • edited

highfive commented Apr 29, 2019

highfive commented Apr 29, 2019

bors-servo commented Apr 29, 2019

Manishearth commented Apr 30, 2019

Manishearth commented Apr 30, 2019

paulrouget commented Apr 30, 2019

Manishearth commented Apr 30, 2019

paulrouget commented Apr 30, 2019

paulrouget commented Apr 30, 2019

jdm commented Apr 30, 2019

paulrouget commented May 2, 2019

paulrouget commented May 2, 2019

paulrouget commented May 2, 2019

bors-servo commented May 2, 2019

paulrouget commented May 2, 2019

paulrouget commented May 2, 2019

bors-servo commented May 2, 2019

bors-servo commented May 2, 2019

bors-servo commented May 21, 2019

paulrouget commented May 22, 2019

paulrouget commented May 22, 2019

bors-servo commented May 22, 2019

bors-servo commented May 22, 2019

paulrouget commented May 22, 2019

jdm commented May 22, 2019

bors-servo commented May 22, 2019

bors-servo commented May 22, 2019

bors-servo commented May 22, 2019

paulrouget commented Apr 29, 2019 •

edited