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

Switch android to use GLESv3. #266

Merged
merged 1 commit into from May 3, 2016
Merged

Switch android to use GLESv3. #266

merged 1 commit into from May 3, 2016

Conversation

@glennw
Copy link
Member

glennw commented Apr 29, 2016

No description provided.

@glennw
Copy link
Member Author

glennw commented Apr 29, 2016

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 29, 2016

The purely administrative bits look good to me, but there are some constant changes in there that I'd like for @pcwalton to take a quick look at, if possible.

Thanks for doing this, @glennw! This is huge for all the people clamoring for Android support for Servo+WR in master.

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 29, 2016

From Travis:

/home/travis/.cargo/git/checkouts/webrender_traits-e24a580db67dabe6/master/src/webgl.rs:295:17: 295:38 error: unresolved name `gl::copy_tex_image_2d` [E0425]

/home/travis/.cargo/git/checkouts/webrender_traits-e24a580db67dabe6/master/src/webgl.rs:295                 gl::copy_tex_image_2d(target, level, internal_format, x, y, width, height, border),

                                                                                                            ^~~~~~~~~~~~~~~~~~~~~

/home/travis/.cargo/git/checkouts/webrender_traits-e24a580db67dabe6/master/src/webgl.rs:295:17: 295:38 help: run `rustc --explain E0425` to see a detailed explanation

error: aborting due to previous error

error: Could not compile `webrender_traits`.
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 30, 2016

@pcwalton Could you please take a look at these changes (assuming gw can fix the build failure)? This work is blocking Android. Thanks!

@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 2, 2016

@pcwalton Can you please look at this PR this week? Thanks!

@glennw
Copy link
Member Author

glennw commented May 2, 2016

@larsbergstrom I'm not sure what was up with travis - I retried the PR on travis this morning and it is green now.

@pcwalton
Copy link
Collaborator

pcwalton commented May 3, 2016

@bors-servo
Copy link
Contributor

bors-servo commented May 3, 2016

📌 Commit 46fc29e has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented May 3, 2016

Testing commit 46fc29e with merge 4353e6b...

bors-servo added a commit that referenced this pull request May 3, 2016
Switch android to use GLESv3.
@bors-servo
Copy link
Contributor

bors-servo commented May 3, 2016

☀️ Test successful - travis

@bors-servo bors-servo merged commit 46fc29e into servo:master May 3, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@glennw glennw deleted the glennw:android-es3 branch Dec 12, 2016
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.