Skip to content

WebXR sessions track draw texture#23857

Merged
bors-servo merged 1 commit intoservo:masterfrom
asajeffrey:webxr-sessions-track-draw-texture
Jul 28, 2019
Merged

WebXR sessions track draw texture#23857
bors-servo merged 1 commit intoservo:masterfrom
asajeffrey:webxr-sessions-track-draw-texture

Conversation

@asajeffrey
Copy link
Copy Markdown
Contributor

@asajeffrey asajeffrey commented Jul 25, 2019 •
edited
Loading

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

@asajeffrey asajeffrey added S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged. A-xr-zomg AR/VR/MR labels Jul 25, 2019
@highfive
Copy link
Copy Markdown

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

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 25, 2019
@asajeffrey asajeffrey changed the title WebXR essions track draw texture WebXR sessions track draw texture Jul 25, 2019
@asajeffrey
Copy link
Copy Markdown
Contributor Author

asajeffrey commented Jul 25, 2019

The matching webxr changes are servo/webxr#31

@asajeffrey asajeffrey force-pushed the webxr-sessions-track-draw-texture branch from 1803be6 to 832ff70 Compare July 27, 2019 20:04
@asajeffrey asajeffrey marked this pull request as ready for review July 27, 2019 20:04
@asajeffrey
Copy link
Copy Markdown
Contributor Author

asajeffrey commented Jul 27, 2019

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jul 27, 2019

📌 Commit 832ff70 has been approved by Manishearth

@highfive highfive assigned Manishearth and unassigned emilio Jul 27, 2019
@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 Jul 27, 2019
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jul 27, 2019

⌛ Testing commit 832ff70 with merge fc95a72...

bors-servo pushed a commit that referenced this pull request Jul 27, 2019
Auto merge of #23857 - asajeffrey:webxr-sessions-track-draw-texture, …
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
Copy Markdown
Contributor

bors-servo commented Jul 27, 2019

💔 Test failed - linux-rel-wpt

@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 Jul 27, 2019
@jdm
Copy link
Copy Markdown
Member

jdm commented Jul 27, 2019 •
edited
Loading 


  ▶ 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
Copy Markdown
Contributor 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 webxr-sessions-track-draw-texture branch from 832ff70 to 3012557 Compare July 28, 2019 14:03
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 28, 2019
@jdm
Copy link
Copy Markdown
Member

jdm commented Jul 28, 2019

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jul 28, 2019

📌 Commit 3012557 has been approved by Manishearth

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

bors-servo commented Jul 28, 2019

⌛ Testing commit 3012557 with merge 82f1355...

bors-servo pushed a commit that referenced this pull request Jul 28, 2019
Auto merge of #23857 - asajeffrey:webxr-sessions-track-draw-texture, …
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 -->
@jdm
Get XR sessions to track the draw texture, so we render the XR frameb…
c757a9c 
…uffer rather than the default canvas framebuffer
@jdm jdm force-pushed the webxr-sessions-track-draw-texture branch from 3012557 to c757a9c Compare July 28, 2019 14:24
@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 Jul 28, 2019
@jdm
Copy link
Copy Markdown
Member

jdm commented Jul 28, 2019

@bors-servo r=Manishearth

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jul 28, 2019

📌 Commit c757a9c has been approved by Manishearth

@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 Jul 28, 2019
@jdm
Copy link
Copy Markdown
Member

jdm commented Jul 28, 2019

@bors-servo force

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jul 28, 2019

⌛ Testing commit c757a9c with merge eb4f2d1...

bors-servo pushed a commit that referenced this pull request Jul 28, 2019
Auto merge of #23857 - asajeffrey:webxr-sessions-track-draw-texture, …
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
Copy Markdown
Member

jdm commented Jul 28, 2019

@bors-servo p=11 treeclosed=10

@bors-servo
Copy link
Copy Markdown
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
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 28, 2019
@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 Manishearth approved these changes

Assignees

@Manishearth Manishearth

Labels

A-xr-zomg AR/VR/MR S-blocked-on-external Something, somewhere else, needs to happen before this PR can be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@asajeffrey @highfive @bors-servo @jdm @Manishearth @emilio