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.

Sign up for GitHub

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

Jump to bottom

Implement WebGL getUniform API #20330

Closed
wants to merge 1 commit into from
Closed

Implement WebGL getUniform API #20330

wants to merge 1 commit into from

Conversation

gootorov
Copy link
Contributor

@gootorov gootorov commented Mar 18, 2018 •
edited

Reference: WebGL 1

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

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGLRenderingContext.webidl, components/script/dom/webgl2renderingcontext.rs
  • @fitzgen: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGLRenderingContext.webidl, components/script/dom/webgl2renderingcontext.rs
  • @KiChjang: components/script/dom/webglrenderingcontext.rs, components/script/dom/webidls/WebGLRenderingContext.webidl, components/script/dom/webgl2renderingcontext.rs

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 18, 2018
@gootorov
Copy link
Contributor Author

Don't merge this yet. This is work in progress and we need to wait for servo/gleam#147 to land first.

@emilio emilio mentioned this pull request Mar 18, 2018
Open
@jdm jdm added the S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. label Mar 18, 2018
@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Mar 19, 2018
@jdm jdm removed S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. S-needs-rebase There are merge conflict errors. labels Mar 20, 2018
@emilio
Copy link
Member

emilio commented Mar 20, 2018

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit e751810 with merge bb25bc6...

bors-servo pushed a commit that referenced this pull request Mar 20, 2018
Auto merge of #20330 - gootorov:webgl-getUniform, r=<try>
bb25bc6 
[WIP] Implement WebGL getUniform API

<!-- Please describe your changes on the following line: -->

---
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/20330)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - android

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Mar 20, 2018
@highfive highfive removed the S-tests-failed The changes caused existing tests to fail. label Mar 20, 2018
@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Mar 21, 2018
@gootorov
Copy link
Contributor Author

@bors-servo try

@bors-servo
Copy link
Contributor

@gootorov: 🔑 Insufficient privileges: and not in try users

@emilio
Copy link
Member

emilio commented Mar 21, 2018

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Trying commit 04ed4c3 with merge e13c404...

bors-servo pushed a commit that referenced this pull request Mar 21, 2018
Auto merge of #20330 - gootorov:webgl-getUniform, r=<try>
e13c404 
[WIP] Implement WebGL getUniform API

<!-- Please describe your changes on the following line: -->

---
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/20330)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-wpt

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 20, 2018
@jdm
Copy link
Member

jdm commented Jun 20, 2018

@bors-servo try
@avadacatavra I had to make a bunch of adjustments to the patch as part of the rebase. Could you take another look at the changes?

@bors-servo
Copy link
Contributor

⌛ Trying commit 7087c78 with merge bc90af5...

bors-servo pushed a commit that referenced this pull request Jun 20, 2018
Auto merge of #20330 - gootorov:webgl-getUniform, r=<try>
bc90af5 
Implement WebGL getUniform API

<!-- Please describe your changes on the following line: -->
Reference: [WebGL 1](https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10)

---
<!-- 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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/20330)
<!-- Reviewable:end -->
@avadacatavra
Copy link
Contributor

@bors-servo r+

@jdm i think it still looks good

@bors-servo
Copy link
Contributor

📌 Commit a62a4b3 has been approved by avadacatavra

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jun 20, 2018
@bors-servo
Copy link
Contributor

⌛ Testing commit a62a4b3 with merge 7b174d6...

bors-servo pushed a commit that referenced this pull request Jun 20, 2018
Auto merge of #20330 - gootorov:webgl-getUniform, r=avadacatavra
7b174d6 
Implement WebGL getUniform API

<!-- Please describe your changes on the following line: -->
Reference: [WebGL 1](https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10)

---
<!-- 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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/20330)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel-css

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 20, 2018
@gootorov
Copy link
Contributor Author

gootorov commented Jun 27, 2018 •
edited

Sorry for stalling this. I had completed my exams and then I was away from the computer for quite a while. Let me know if there's anything I can assist with.

@gootorov
Copy link
Contributor Author

Looks like the previous failure was some infrastructure error.

@bors-servo try

@bors-servo
Copy link
Contributor

⌛ Testing commit a62a4b3 with merge dc538a1...

bors-servo pushed a commit that referenced this pull request Jun 30, 2018
Auto merge of #20330 - gootorov:webgl-getUniform, r=avadacatavra
dc538a1 
Implement WebGL getUniform API

<!-- Please describe your changes on the following line: -->
Reference: [WebGL 1](https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.10)

---
<!-- 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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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/20330)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jun 30, 2018
@bors-servo
Copy link
Contributor

💔 Test failed - android

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jun 30, 2018
@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 5, 2018
@bors-servo
Copy link
Contributor

🔒 Merge conflict

@jdm
Copy link
Member

jdm commented Jul 18, 2018

Superseded by the changes in #21202. Sorry there were so many issues here!

@jdm jdm closed this Jul 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nox nox nox left review comments

Assignees

@avadacatavra avadacatavra

Labels
S-needs-rebase There are merge conflict errors. S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@gootorov @highfive @bors-servo @emilio @CYBAI @nox @jdm @avadacatavra @glennw