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

Use surfman for managing GL surfaces #24482

Merged
merged 1 commit into from Nov 1, 2019
Merged

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Oct 17, 2019

Replaces texture sharing with surfman surface sharing.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #23509 and #24256
  • These changes do not require tests because this is backend gfx
@highfive
Copy link

highfive commented Oct 17, 2019

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py
  • @cbrewster: components/constellation/Cargo.toml, components/constellation/constellation.rs
  • @KiChjang: components/script/dom/webglframebuffer.rs, components/script/dom/xrwebgllayer.rs, components/script/dom/document.rs, components/script/dom/webgl2renderingcontext.rs, components/script/dom/xrsession.rs and 4 more
@highfive
Copy link

highfive commented Oct 17, 2019

warning Warning warning

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

jdm left a comment

I skimmed a lot of webgl_thread.rs but overall this looks like it's in good shape.

ports/libsimpleservo/api/Cargo.toml Show resolved Hide resolved
ports/libsimpleservo/capi/Cargo.toml Show resolved Hide resolved
python/servo/command_base.py Show resolved Hide resolved
python/servo/command_base.py Show resolved Hide resolved
ports/glutin/Cargo.toml Show resolved Hide resolved
components/canvas/webgl_thread.rs Outdated Show resolved Hide resolved
@jdm
Copy link
Member

jdm commented Oct 17, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2019

🔒 Merge conflict

@jdm
Copy link
Member

jdm commented Oct 17, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2019

Trying commit e3943ea with merge a866796...

bors-servo added a commit that referenced this pull request Oct 17, 2019
Use surfman for managing GL surfaces

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

Replaces texture sharing with surfman surface sharing.

---
<!-- 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
- [x] These changes fix #23509  and #24256
- [x] These changes do not require tests because this is backend gfx

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2019

💔 Test failed - linux-rel-wpt

@asajeffrey
Copy link
Member Author

asajeffrey commented Oct 17, 2019

Most comments addressed, the outstanding one is about depth/stencil/alpha.

@asajeffrey
Copy link
Member Author

asajeffrey commented Oct 17, 2019

Build failures are caused by the warnings caused by WebVR not being implemented.

@asajeffrey
Copy link
Member Author

asajeffrey commented Oct 17, 2019

@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2019

Trying commit abbf37f with merge 88c3a8d...

bors-servo added a commit that referenced this pull request Oct 17, 2019
Use surfman for managing GL surfaces

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

Replaces texture sharing with surfman surface sharing.

---
<!-- 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
- [x] These changes fix #23509  and #24256
- [x] These changes do not require tests because this is backend gfx

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2019

💔 Test failed - linux-rel-css

@asajeffrey
Copy link
Member Author

asajeffrey commented Oct 17, 2019

The android build is failing because something is causing a -lGL link flag to be emitted.

@jdm
Copy link
Member

jdm commented Oct 17, 2019

Also be aware: the WPT tests on linux had a lot of failures: https://build.servo.org/builders/linux-rel-css/builds/13780

@jdm
Copy link
Member

jdm commented Oct 17, 2019

They're all crashes of:

 │ Failed to create graphics context!: NoCurrentContext (thread main, at src/libcore/result.rs:1165)
@jdm jdm added this to In progress in UWP port Oct 17, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented Nov 1, 2019

Squashed. @bors-servo r=jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 1, 2019

📌 Commit a358bca has been approved by jdm

@bors-servo
Copy link
Contributor

bors-servo commented Nov 1, 2019

Testing commit a358bca with merge 162b2f5...

bors-servo added a commit that referenced this pull request Nov 1, 2019
Use surfman for managing GL surfaces

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

Replaces texture sharing with surfman surface sharing.

---
<!-- 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
- [x] These changes fix #23509  and #24256
- [x] These changes do not require tests because this is backend gfx

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 1, 2019

💔 Test failed - status-taskcluster

@jdm
Copy link
Member

jdm commented Nov 1, 2019

@bors-servo retry force

@bors-servo
Copy link
Contributor

bors-servo commented Nov 1, 2019

💣 Failed to start rebuilding: Unknown error

@bors-servo
Copy link
Contributor

bors-servo commented Nov 1, 2019

Testing commit a358bca with merge 4e22889...

bors-servo added a commit that referenced this pull request Nov 1, 2019
Use surfman for managing GL surfaces

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

Replaces texture sharing with surfman surface sharing.

---
<!-- 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
- [x] These changes fix #23509  and #24256
- [x] These changes do not require tests because this is backend gfx

<!-- 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. -->
@bors-servo
Copy link
Contributor

bors-servo commented Nov 1, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing 4e22889 to master...

@bors-servo bors-servo merged commit a358bca into servo:master Nov 1, 2019
2 checks passed
2 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
homu Test successful
Details
UWP port automation moved this from In progress to Done Nov 1, 2019
@atouchet atouchet mentioned this pull request Nov 20, 2019
2 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
UWP port
  
Done
Linked issues

Successfully merging this pull request may close these issues.

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