Skip to content
This repository was archived by the owner on Jun 8, 2020. It is now read-only.

Split out GLContext from GLRasterizationContext #60

Merged
merged 1 commit into from
Jul 28, 2015
Merged

Split out GLContext from GLRasterizationContext #60

merged 1 commit into from
Jul 28, 2015

Conversation

mrobinson
Copy link
Member

This will allow Servo to preserve the same GLContext and GrContext
between rasterization targets, thus vastly improving the performance of
OpenGL rasterization.

Review on Reviewable

This will allow Servo to preserve the same GLContext and GrContext
between rasterization targets, thus vastly improving the performance of
OpenGL rasterization.
@mrobinson
Copy link
Member Author

@pcwalton r?

@pcwalton
Copy link
Contributor

@bors-servo: r+

@bors-servo
Copy link

📌 Commit bdaf858 has been approved by pcwalton

@bors-servo
Copy link

⌛ Testing commit bdaf858 with merge cb7bb13...

bors-servo pushed a commit that referenced this pull request Jul 28, 2015
Split out GLContext from GLRasterizationContext

This will allow Servo to preserve the same GLContext and GrContext
between rasterization targets, thus vastly improving the performance of
OpenGL rasterization.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/skia/60)
<!-- Reviewable:end -->
@bors-servo
Copy link

💔 Test failed - travis

@mrobinson
Copy link
Member Author

Hrm. The build failure seems unrelated:

error: failed to resolve. Could not find `LocalSource` in `syntax::ast` [E0433]
/home/travis/.cargo/registry/src/github.com-0a35038f75765ae4/aster-0.3.3/src/stmt.rs:60             source: ast::LocalSource::LocalLet,

@bors-servo retry

@bors-servo
Copy link

⌛ Testing commit bdaf858 with merge cfe10fb...

bors-servo pushed a commit that referenced this pull request Jul 28, 2015
Split out GLContext from GLRasterizationContext

This will allow Servo to preserve the same GLContext and GrContext
between rasterization targets, thus vastly improving the performance of
OpenGL rasterization.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/skia/60)
<!-- Reviewable:end -->
@bors-servo
Copy link

💔 Test failed - travis

@jdm
Copy link
Member

jdm commented Jul 28, 2015

It's probably because there's no Cargo.lock being used and it's grabbing the latest version of aster as a dependency of serde.

@mrobinson
Copy link
Member Author

@jdm So what do you think the best way forward is here? I'm happy to check in a Cargo.lock file if we want to start doing that for dependencies.

@mrobinson
Copy link
Member Author

@jdm @metajack I'm confused by this failure. It's a compilation failure in aster, which is a leaf dependency which only depends on rust. I don't seem to have any issues compiling either serde or aster alone using mach.

Could this be because of a difference in the version of rustc? Locally mach pulls down

rustc 1.3.0-dev (fddfd089b 2015-07-10)

but it seems that travis is using:

rustc 1.3.0-nightly (8b835572b 2015-07-27)

@mrobinson
Copy link
Member Author

And indeed ast::LocalSource was removed from rust 2 days ago: rust-lang/rust#27297

@mrobinson
Copy link
Member Author

Since the issue appears to be with aster upstream, @mbrubeck suggested pushing the "merge pull request" button manually. Does that seem like a appropriate approach here?

@metajack
Copy link
Contributor

As I said in IRC, the correct thing is to pin Travis to use a working version of nightly. So add

rust: nightly-$date

to .travis.yml, where $date is the date of a working rustc. That should solve this problem, although the serde = "*" in euclid is going to potentially bite us down the road as well.

@mrobinson
Copy link
Member Author

@bors-servo retry

@bors-servo
Copy link

⌛ Testing commit bdaf858 with merge 6eddb1b...

bors-servo pushed a commit that referenced this pull request Jul 28, 2015
Split out GLContext from GLRasterizationContext

This will allow Servo to preserve the same GLContext and GrContext
between rasterization targets, thus vastly improving the performance of
OpenGL rasterization.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/skia/60)
<!-- Reviewable:end -->
@bors-servo
Copy link

☀️ Test successful - travis

@bors-servo bors-servo merged commit bdaf858 into servo:master Jul 28, 2015
@mrobinson mrobinson deleted the gl-context branch July 28, 2015 23:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants