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

webgl: Add vertexAttribPointer and disableVertexAttribArray support #13101

Closed
wants to merge 2 commits into from
Closed

webgl: Add vertexAttribPointer and disableVertexAttribArray support #13101

wants to merge 2 commits into from
+91 −31

Conversation

@anholt
Copy link
Contributor

anholt commented Aug 28, 2016 •
edited by larsbergstrom

webgl: Add vertexAttribPointer and disableVertexAttribArray support

  • ./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
Copy link

highfive commented Aug 28, 2016

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGLRenderingContext.webidl
  • @emilio: components/script/dom/webglrenderingcontext.rs
@anholt
Copy link
Contributor Author

anholt commented Aug 28, 2016

This branch requires corresponding updates to webrender (servo/webrender#375),. I'm hoping someone else can handle the version bumping for that, unless it's easy for me to do.
@emilio
Copy link
Member

emilio commented Aug 28, 2016

LGTM once the corresponding updates have landed. I opened servo/webrender#376, and probably this needs to wait to #13099.
@emilio
Copy link
Member

emilio commented Aug 28, 2016

Oh, also, thanks for this, @anholt, as usual :-)
@emilio
Copy link
Member

emilio commented Aug 30, 2016

@anholt you should be able to do ./mach cargo-update -p webrender_traits in your tree, and push the result here. That should allow this to land without servo/webrender#376
@bors-servo
Copy link
Contributor

bors-servo commented Sep 2, 2016

☔ The latest upstream changes (presumably #13156) made this pull request unmergeable. Please resolve the merge conflicts.
@anholt anholt force-pushed the anholt:webgl-vertex-attrib-pointer branch from 62e9948 to fd4774d Sep 17, 2016
@stshine
Copy link
Contributor

stshine commented Sep 18, 2016

@bors-servo try
bors-servo added a commit that referenced this pull request Sep 18, 2016
@bors-servo
Auto merge of #13101 - anholt:webgl-vertex-attrib-pointer, r=<try>
Loading status checks…
493c507 
webgl: Add vertexAttribPointer and disableVertexAttribArray support

<!-- Please describe your changes on the following line: -->
webgl: Add vertexAttribPointer and disableVertexAttribArray support

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./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/13101)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2016

⌛ Trying commit fd4774d with merge 493c507...
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2016

💔 Test failed - mac-rel-wpt
anholt added 2 commits Aug 22, 2016
@anholt
webgl: Switch to using full vertexAttribPointer support.
8e8fd1e 
Fixes many conformance testcase crashes in unexpected GL errors or in
DOM-side errors for non-FLOAT attribs.
@anholt
webgl: Enable disableVertexAttribArray().
Loading status checks…
16a14e2 
Fixes some early-exit failures in testcases.
@anholt anholt force-pushed the anholt:webgl-vertex-attrib-pointer branch from fd4774d to 16a14e2 Sep 21, 2016
@pcwalton
Copy link
Contributor

pcwalton commented Sep 26, 2016

@bors-servo: try
@bors-servo
Copy link
Contributor

bors-servo commented Sep 26, 2016

⌛ Trying commit 16a14e2 with merge d3dc3fd...
bors-servo added a commit that referenced this pull request Sep 26, 2016
@bors-servo
Auto merge of #13101 - anholt:webgl-vertex-attrib-pointer, r=<try>
Loading status checks…
d3dc3fd 
webgl: Add vertexAttribPointer and disableVertexAttribArray support

<!-- Please describe your changes on the following line: -->
webgl: Add vertexAttribPointer and disableVertexAttribArray support

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./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/13101)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Sep 26, 2016

💔 Test failed - linux-rel
@highfive
Copy link

highfive commented Sep 26, 2016 

  ▶ Unexpected subtest result in /html/webappapis/scripting/event-loops/microtask_after_raf.html:
  └ PASS [expected FAIL] Microtask execute immediately after script
@KiChjang KiChjang removed the S-needs-rebase label Oct 1, 2016
@KiChjang
Copy link
Member

KiChjang commented Oct 1, 2016

r? @emilio
@emilio
Copy link
Member

emilio commented Oct 2, 2016

@bors-servo: r+

Thanks for the ping @KiChjang :)
@bors-servo
Copy link
Contributor

bors-servo commented Oct 2, 2016

📌 Commit 16a14e2 has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Oct 4, 2016

☔ The latest upstream changes (presumably #13208) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
Copy link
Member

jdm commented Oct 4, 2016

Shoot, the CI bot missed this somehow. We can start the process over once the merge conflicts are addressed.
@anholt
Copy link
Contributor Author

anholt commented Oct 7, 2016

The conflicts are that @MortimerGoro's patch landed instead.
@anholt anholt closed this Oct 7, 2016
@anholt anholt deleted the anholt:webgl-vertex-attrib-pointer branch Oct 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@emilio emilio

Labels
S-needs-rebase
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
@anholt @highfive @emilio @bors-servo @stshine @pcwalton @KiChjang @jdm
You can’t perform that action at this time.