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

fix(webgl): fix issue https://github.com/servo/servo/issues/21352 #21353

Merged
merged 1 commit into from Sep 19, 2018

Conversation

@DanxiongLei
Copy link
Contributor

DanxiongLei commented Aug 7, 2018

If we have a bounded framebuffer previously, which is not the one to delete.
we would not change the !binding, but we would change the GLSide with Command::BindFramebuffer(Default).

change it to:

check the id before sending the Command


  • ./mach build -d does not report any errors

  • ./mach test-tidy does not report any errors

  • These changes fix #21352

  • There are tests for these changes OR

  • These changes do not require tests because it's obviously simple.


This change is Reviewable

If we have a bounded framebuffer previously, which is not the one to delete.
we would not change the !binding, but we would change the GLSide with Command::BindFramebuffer(Default).
@highfive
Copy link

highfive commented Aug 7, 2018

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @Manishearth (or someone else) soon.

@highfive
Copy link

highfive commented Aug 7, 2018

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/webglrenderingcontext.rs
  • @KiChjang: components/script/dom/webglrenderingcontext.rs
@highfive
Copy link

highfive commented Aug 7, 2018

warning Warning warning

  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Aug 7, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2018

Trying commit ee916d5 with merge 247e1a9...

bors-servo added a commit that referenced this pull request Aug 7, 2018
fix(webgl): fix issue #21352

If we have a bounded framebuffer previously, which is not the one to delete.
we would not change the !binding, but we would change the GLSide with Command::BindFramebuffer(Default).

change it to:

check the id before sending the Command

---

- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [x] These changes fix #21352

- [ ] There are tests for these changes OR
- [x] These changes do not require tests because `it's obviously simple.`

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

bors-servo commented Aug 7, 2018

@jdm
Copy link
Member

jdm commented Aug 7, 2018

Hmm, the fact that the webgl conformance tests don't report any difference is a bit worrying.

@DanxiongLei
Copy link
Contributor Author

DanxiongLei commented Aug 8, 2018

I will add a test, afterwards. Maybe in this Saturday.

@nox
Copy link
Member

nox commented Sep 19, 2018

@jdm I don't think this is worrisome, there is no way to write a test that we actually deleted the thing on the GL side, given we don't ever ask it if something was deleted (we keep track of deletion status on the DOM side independently). Let's land this.

@jdm
Copy link
Member

jdm commented Sep 19, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

📌 Commit ee916d5 has been approved by jdm

@highfive highfive assigned jdm and unassigned Manishearth Sep 19, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

Testing commit ee916d5 with merge 20d6bec...

bors-servo added a commit that referenced this pull request Sep 19, 2018
fix(webgl): fix issue #21352

If we have a bounded framebuffer previously, which is not the one to delete.
we would not change the !binding, but we would change the GLSide with Command::BindFramebuffer(Default).

change it to:

check the id before sending the Command

---

- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [x] These changes fix #21352

- [ ] There are tests for these changes OR
- [x] These changes do not require tests because `it's obviously simple.`

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

bors-servo commented Sep 19, 2018

💔 Test failed - linux-rel-wpt

@jdm
Copy link
Member

jdm commented Sep 19, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Sep 19, 2018

Testing commit ee916d5 with merge b1c6281...

bors-servo added a commit that referenced this pull request Sep 19, 2018
fix(webgl): fix issue #21352

If we have a bounded framebuffer previously, which is not the one to delete.
we would not change the !binding, but we would change the GLSide with Command::BindFramebuffer(Default).

change it to:

check the id before sending the Command

---

- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [x] These changes fix #21352

- [ ] There are tests for these changes OR
- [x] These changes do not require tests because `it's obviously simple.`

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

bors-servo commented Sep 19, 2018

@bors-servo bors-servo merged commit ee916d5 into servo:master Sep 19, 2018
3 of 4 checks passed
3 of 4 checks passed
Taskcluster (pull_request) TaskGroup: failure
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

6 participants
You can’t perform that action at this time.