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

webgl: FBO support preparation #13309

Merged
merged 5 commits into from Sep 21, 2016

Conversation

Projects
None yet
8 participants
@anholt
Contributor

anholt commented Sep 18, 2016

Sending this PR now so that we can get the webrender patches merged. This is prep for the webgl-fbo series, with one small fix for some conformance tests.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because _____

This change is Reviewable

@highfive

This comment has been minimized.

Show comment
Hide comment
@highfive

highfive Sep 18, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglframebuffer.rs
  • @emilio: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglframebuffer.rs

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglframebuffer.rs
  • @emilio: components/script/dom/webglrenderingcontext.rs, components/script/dom/webglframebuffer.rs
@anholt

This comment has been minimized.

Show comment
Hide comment
@anholt

anholt Sep 18, 2016

Contributor

Note that the first commit will require a bump of the webrender dependency. I haven't figured out how to make mach update-cargo update to a commit that's not in master, though.

Contributor

anholt commented Sep 18, 2016

Note that the first commit will require a bump of the webrender dependency. I haven't figured out how to make mach update-cargo update to a commit that's not in master, though.

@Ms2ger

This comment has been minimized.

Show comment
Hide comment
@Ms2ger

Ms2ger Sep 20, 2016

Contributor

r? @emilio

Contributor

Ms2ger commented Sep 20, 2016

r? @emilio

@highfive highfive assigned emilio and unassigned Ms2ger Sep 20, 2016

@emilio

This comment has been minimized.

Show comment
Hide comment
@emilio

emilio Sep 20, 2016

Member

r=me with the webrender traits update

@anholt feel free to land yourself this one :)

@bors-servo: delegate+

Member

emilio commented Sep 20, 2016

r=me with the webrender traits update

@anholt feel free to land yourself this one :)

@bors-servo: delegate+

@bors-servo

This comment has been minimized.

Show comment
Hide comment
@bors-servo

bors-servo Sep 20, 2016

Contributor

✌️ @anholt can now approve this pull request

Contributor

bors-servo commented Sep 20, 2016

✌️ @anholt can now approve this pull request

@glennw

This comment has been minimized.

Show comment
Hide comment
@glennw

glennw Sep 20, 2016

Member

@anholt The required webrender changes have landed in master now. So you should be able to to ./mach update-cargo -p webrender in this branch and then we should be able to land this.

Member

glennw commented Sep 20, 2016

@anholt The required webrender changes have landed in master now. So you should be able to to ./mach update-cargo -p webrender in this branch and then we should be able to land this.

anholt and others added some commits Sep 16, 2016

webgl: Do validation that the framebuffer is complete for FBO operati…
…ons.

Given that we can't make a complete FBO yet, just return false from
the status check.
webgl: Don't forget to update the WebGL context's RB binding.
We need to track the RB in the DOM context for
getParameter(gl.RENDERBUFFER_BINDING), among others.
webgl: Don't forget update WebGL's texture binding on unbind.
This doesn't appear to fix any testcases, but I noticed it when fixing
renderbuffers.
Update webrender to master, including shaders.
This updates webrender to include the webgl related changes
needed for this patch. There was an additional commit in
webrender before these landed, so also copy the shaders
for that change across. There is an interface change to
webrender push_image. For now, just pass zero, which is a
no-op to this function. A follow up commit will introduce
the servo specific changes to use this new interface.
@jdm

This comment has been minimized.

Show comment
Hide comment
@jdm

jdm Sep 20, 2016

Member

@bors-servo: r=emilio

Member

jdm commented Sep 20, 2016

@bors-servo: r=emilio

@bors-servo

This comment has been minimized.

Show comment
Hide comment
@bors-servo

bors-servo Sep 20, 2016

Contributor

📌 Commit 6b1104e has been approved by emilio

Contributor

bors-servo commented Sep 20, 2016

📌 Commit 6b1104e has been approved by emilio

@bors-servo

This comment has been minimized.

Show comment
Hide comment
@bors-servo

bors-servo Sep 21, 2016

Contributor

⌛️ Testing commit 6b1104e with merge 7c0dfd0...

Contributor

bors-servo commented Sep 21, 2016

⌛️ Testing commit 6b1104e with merge 7c0dfd0...

bors-servo added a commit that referenced this pull request Sep 21, 2016

Auto merge of #13309 - anholt:webgl-fbo-prep, r=emilio
webgl: FBO support preparation

<!-- Please describe your changes on the following line: -->
Sending this PR now so that we can get the webrender patches merged.  This is prep for the webgl-fbo series, with one small fix for some conformance tests.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13309)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Show comment
Hide comment
Contributor

bors-servo commented Sep 21, 2016

@bors-servo bors-servo merged commit 6b1104e into servo:master Sep 21, 2016

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment