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

WebXR sessions track draw texture #23857

Merged
merged 1 commit into from Jul 28, 2019
Merged

WebXR sessions track draw texture #23857

merged 1 commit into from Jul 28, 2019

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Jul 25, 2019 •
edited

Send the XR framebuffer texture to the XR session.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because we don't have webxr reftests

This change is Reviewable
@highfive
Copy link

highfive commented Jul 25, 2019

Heads up! This PR modifies the following files:

  • @KiChjang: components/net/tests/main.rs, components/script/dom/xrwebgllayer.rs, components/script/dom/xrtest.rs, components/script/dom/webglrenderingcontext.rs, components/script/dom/xrsession.rs and 1 more
@asajeffrey asajeffrey changed the title WebXR essions track draw texture WebXR sessions track draw texture Jul 25, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented Jul 25, 2019

The matching webxr changes are servo/webxr#31
@Manishearth
Manishearth approved these changes Jul 27, 2019
View changes
@asajeffrey asajeffrey force-pushed the asajeffrey:webxr-sessions-track-draw-texture branch from 1803be6 to 832ff70 Jul 27, 2019
@asajeffrey asajeffrey marked this pull request as ready for review Jul 27, 2019
@asajeffrey
Copy link
Member Author

asajeffrey commented Jul 27, 2019

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

📌 Commit 832ff70 has been approved by Manishearth
@highfive highfive assigned Manishearth and unassigned emilio Jul 27, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Jul 27, 2019

⌛ Testing commit 832ff70 with merge fc95a72...
bors-servo added a commit that referenced this pull request Jul 27, 2019
@bors-servo
Auto merge of #23857 - asajeffrey:webxr-sessions-track-draw-texture, …
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
fc95a72 
…r=Manishearth

WebXR sessions track draw texture

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

Send the XR framebuffer texture to the XR session.

---
<!-- 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 do not require tests because we don't have webxr reftests

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

bors-servo commented Jul 27, 2019

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented Jul 27, 2019 •
edited 


  ▶ Unexpected subtest result in /webxr/xrSession_prevent_multiple_exclusive.https.html:
  └ PASS [expected FAIL] Test prevention of multiple simultaneous immersive sessions

  ▶ OK [expected ERROR] /webxr/xrSession_input_events_end.https.html

  ▶ ERROR [expected TIMEOUT] /webxr/xrBoundedReferenceSpace_updates.https.html
  │   → fakeDeviceController.setBoundsGeometry is not a function
  │ 
  └ undefined:undefined:undefined

  ▶ OK [expected ERROR] /webxr/xrSession_end.https.html

  ▶ Unexpected subtest result in /webxr/xrSession_end.https.html:
  │ FAIL [expected NOTRUN] end event fires when non-immersive session ends
  └   → promise_test: Unhandled rejection with value: undefined
@asajeffrey
Copy link
Member Author

asajeffrey commented Jul 27, 2019

Oh, have I accidentally fixed some broken tests? I'll update the expectations when I'm in front of a computer.
@jdm jdm mentioned this pull request Jul 28, 2019
Closed
@jdm jdm force-pushed the asajeffrey:webxr-sessions-track-draw-texture branch from 832ff70 to 3012557 Jul 28, 2019
@jdm
Copy link
Member

jdm commented Jul 28, 2019

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2019

📌 Commit 3012557 has been approved by Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2019

⌛ Testing commit 3012557 with merge 82f1355...
bors-servo added a commit that referenced this pull request Jul 28, 2019
@bors-servo
Auto merge of #23857 - asajeffrey:webxr-sessions-track-draw-texture, …
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
82f1355 
…r=Manishearth

WebXR sessions track draw texture

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

Send the XR framebuffer texture to the XR session.

---
<!-- 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 do not require tests because we don't have webxr reftests

<!-- 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/23857)
<!-- Reviewable:end -->
@asajeffrey @jdm
Get XR sessions to track the draw texture, so we render the XR frameb…
Loading status checks…
c757a9c 
…uffer rather than the default canvas framebuffer
@jdm jdm force-pushed the asajeffrey:webxr-sessions-track-draw-texture branch from 3012557 to c757a9c Jul 28, 2019
@jdm
Copy link
Member

jdm commented Jul 28, 2019

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2019

📌 Commit c757a9c has been approved by Manishearth
@jdm
Copy link
Member

jdm commented Jul 28, 2019

@bors-servo force
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2019

⌛ Testing commit c757a9c with merge eb4f2d1...
bors-servo added a commit that referenced this pull request Jul 28, 2019
@bors-servo
Auto merge of #23857 - asajeffrey:webxr-sessions-track-draw-texture, …
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
eb4f2d1 
…r=Manishearth

WebXR sessions track draw texture

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

Send the XR framebuffer texture to the XR session.

---
<!-- 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 do not require tests because we don't have webxr reftests

<!-- 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/23857)
<!-- Reviewable:end -->
@jdm
Copy link
Member

jdm commented Jul 28, 2019

@bors-servo p=11 treeclosed=10
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2019

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: Manishearth
Pushing eb4f2d1 to master...
@bors-servo bors-servo merged commit c757a9c into servo:master Jul 28, 2019
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@jdm jdm mentioned this pull request Jul 28, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Manishearth Manishearth

Assignees

@Manishearth Manishearth

Labels
A-xr-zomg S-blocked-on-external
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@asajeffrey @highfive @bors-servo @jdm @Manishearth @emilio
You can’t perform that action at this time.