Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Glutin dependency for WebGL #5957

Merged
merged 1 commit into from May 7, 2015
Merged

Conversation

@emilio
Copy link
Member

emilio commented May 6, 2015

Now we have mac support, and since android build is broken, we can
drop glutin from WebGL code.

Went back to upstream repo, see:
servo/surfman#1 (comment)

Review on Reviewable

@highfive
Copy link

highfive commented May 6, 2015

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @glennw (or someone else) soon.

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented May 6, 2015

Critic review: https://critic.hoppipolla.co.uk/r/4919

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm
Copy link
Member

jdm commented May 6, 2015

-S-awaiting-review +S-needs-code-changes


Reviewed files:

  • components/canvas/Cargo.toml @ r1
  • components/canvas/lib.rs @ r1
  • components/canvas/webgl_paint_task.rs @ r1
  • components/servo/Cargo.lock @ r1
  • ports/cef/Cargo.lock @ r1
  • ports/gonk/Cargo.lock @ r1

components/canvas/webgl_paint_task.rs, line 208 [r1] (raw file):
This comment seems addressed.


Comments from the review on Reviewable.io

@emilio emilio force-pushed the emilio:glcontext-mac-support branch from 1411bd6 to 6bef500 May 6, 2015
@emilio
Copy link
Member Author

emilio commented May 6, 2015

@jdm
Copy link
Member

jdm commented May 6, 2015

@bors-servo: r+
-S-awaiting-review +S-awaiting-merge


Comments from the review on Reviewable.io

@bors-servo
Copy link
Contributor

bors-servo commented May 6, 2015

📌 Commit 6bef500 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 6, 2015

Testing commit 6bef500 with merge a39b751...

bors-servo pushed a commit that referenced this pull request May 6, 2015
Now we have mac support, and since android build is broken, we can
drop glutin from WebGL code.

Went back to upstream repo, see:
servo/surfman#1 (comment)

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

bors-servo commented May 6, 2015

💔 Test failed - mac2

@jdm
Copy link
Member

jdm commented May 6, 2015

/Users/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-902f85b061901132/master/src/platform/with_cgl/native_gl_context.rs:47:16: 47:33 error: unresolved name `CGLDestroyContext`
/Users/servo/.cargo/git/checkouts/rust-offscreen-rendering-context-902f85b061901132/master/src/platform/with_cgl/native_gl_context.rs:47             if CGLDestroyContext(self.native_context) != 0 {
                                                                                                                                                        ^~~~~~~~~~~~~~~~~

This needs a update-cargo.

@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2015

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

Now we have mac support, and since android build is broken, we can
drop glutin from WebGL code.

Went back to upstream
(see: servo/surfman#1 (comment))

Rebased
@emilio emilio force-pushed the emilio:glcontext-mac-support branch from 6bef500 to a3b0c10 May 7, 2015
@jdm
Copy link
Member

jdm commented May 7, 2015

@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2015

📌 Commit a3b0c10 has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2015

Testing commit a3b0c10 with merge c7608f7...

bors-servo pushed a commit that referenced this pull request May 7, 2015
Now we have mac support, and since android build is broken, we can
drop glutin from WebGL code.

Went back to upstream repo, see:
servo/surfman#1 (comment)

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

bors-servo commented May 7, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2

@bors-servo bors-servo merged commit a3b0c10 into servo:master May 7, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@emilio emilio deleted the emilio:glcontext-mac-support branch May 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.