Skip to content

/ servo

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

Add missing WebGL interfaces, and a few gl calls #6357

Merged
merged 5 commits into from Jun 13, 2015
Merged

Add missing WebGL interfaces, and a few gl calls #6357

merged 5 commits into from Jun 13, 2015
+688 −362

Conversation

@emilio
Copy link
Member

emilio commented Jun 12, 2015

See the commit descriptions for more details.

Blocked on servo/gleam#24

Review on Reviewable
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Jun 12, 2015

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

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.
@emilio emilio force-pushed the emilio:more-webgl branch from 9b1d047 to 6e1146a Jun 12, 2015
@pcwalton
Copy link
Contributor

pcwalton commented Jun 12, 2015

r=me, looks good!
@emilio
Copy link
Member Author

emilio commented Jun 12, 2015

By the way, It's not blocked anymore since the gleam por has ben merged :P
components/servo/Cargo.lock Outdated
@@ -1040,6 +1040,7 @@ dependencies = [
"fnv 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"gfx_traits 0.0.1",

This comment has been minimized.

Sign in to view
@jdm

jdm Jun 13, 2015

Member

Is this change intentional?

This comment has been minimized.

Sign in to view
@nox

nox Jun 13, 2015

Member

Seeing #6370, probably not.

This comment has been minimized.

Sign in to view
@emilio

emilio Jun 13, 2015

Author Member

Nope, it wasn't.

I noted it but I supposed it was due to some other pr which forgot to update the Cargo.lock files. I'm reverting it :P
@emilio emilio force-pushed the emilio:more-webgl branch from 0a00057 to 08eebac Jun 13, 2015
@nox
Copy link
Member

nox commented Jun 13, 2015

@bors-servo: r=pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

📌 Commit 08eebac has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

⌛ Testing commit 08eebac with merge 6cb7e98...
bors-servo pushed a commit that referenced this pull request Jun 13, 2015
bors-servo
Auto merge of #6357 - ecoal95:more-webgl, r=pcwalton
6cb7e98 
See the commit descriptions for more details. 

Blocked on servo/gleam#24

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

bors-servo commented Jun 13, 2015

💔 Test failed - linux1
@emilio
Copy link
Member Author

emilio commented Jun 13, 2015

Needed to update gleam, my fault, should be solved now.
@nox
Copy link
Member

nox commented Jun 13, 2015

Please reorder commits, this is going to fail to compile if we bisect in the middle of the PR.
@emilio
Copy link
Member Author

emilio commented Jun 13, 2015

What do you mean? Moving the gleam update before the rest of them?
@nox
Copy link
Member

nox commented Jun 13, 2015

Yes.
emilio added 3 commits Jun 13, 2015
@emilio
Update gleam to 0108e2a6c7ca4dc471bfb94ba1ed368335e4da28
ee19279
@emilio
webgl: Add WebGLActiveInfo and WebGLShaderPrecisionFormat interfaces
b0d0476
@emilio
webgl: Uncomment WebGLRenderingContext constants
c33776a
emilio added 2 commits Jun 12, 2015
@emilio
webgl: Add multiple WebGL calls (activeTexture + blend*)
ff568ec 
* activeTexture
* blendColor
* blendFunc
* blendFuncSeparate
* blendEquation
* blendEquationSeparate

Blocked on gleam.
@emilio
webgl: Add drawArrays reftest
Loading status checks…
eb502bd 
I also removed flackyness of the clearColor test, hopefully it's fixed now
that a lot of race conditions have disappeared thanks to @glennw.
@emilio emilio force-pushed the emilio:more-webgl branch from 26fd7e2 to eb502bd Jun 13, 2015
@emilio
Copy link
Member Author

emilio commented Jun 13, 2015

That should do it :)
@nox
Copy link
Member

nox commented Jun 13, 2015

@bors-servo: r=pcwalton

Cool, thanks!
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

📌 Commit eb502bd has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Jun 13, 2015

⌛ Testing commit eb502bd with merge ceaca2e...
bors-servo pushed a commit that referenced this pull request Jun 13, 2015
bors-servo
Auto merge of #6357 - ecoal95:more-webgl, r=pcwalton
Loading status checks…
ceaca2e 
See the commit descriptions for more details. 

Blocked on servo/gleam#24

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

bors-servo commented Jun 13, 2015

☀️ Test successful - android, gonk, linux1, linux2, linux3, mac1, mac2, mac3
@bors-servo bors-servo merged commit eb502bd into servo:master Jun 13, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

Labels
S-awaiting-review
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@emilio @hoppipolla-critic-bot @pcwalton @nox @bors-servo @jdm @highfive
You can’t perform that action at this time.