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

Jump to bottom

Immersive WebXR on Hololens #23945

Merged
merged 2 commits into from Aug 13, 2019
Merged

Immersive WebXR on Hololens #23945

merged 2 commits into from Aug 13, 2019

Conversation

Manishearth
Copy link
Member

@Manishearth Manishearth commented Aug 10, 2019 •
edited

This PR adds support to the OpenXR backend (servo/webxr#37) for Hololens. We support entering immersive mode, but currently do nothing in immersive mode (servo/webxr#38, applying https://github.com/servo/webxr/tree/d3d11-draw should render some red).

This should be ready to land as-is aside from its dependency on #23922. It can be tested on https://manishearth.github.io/webgl-to-webxr/webxr-ar.html (make sure to click through the alerts).

This is based on #23922 .

This builds off of @paulrouget's work.

r? @jdm @paulrouget

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Aug 10, 2019
Manishearth
Manishearth commented Aug 10, 2019
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@Manishearth Manishearth force-pushed the hl-xr-immersive branch 3 times, most recently from a6fab13 to bc5a045 Compare August 10, 2019 05:18
@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Aug 10, 2019
@Manishearth Manishearth force-pushed the hl-xr-immersive branch 4 times, most recently from 1a99095 to 93bf247 Compare August 12, 2019 05:16
@Manishearth
Copy link
Member Author

Should be ready to land, there's not much in here since all the work happened in the other repo, and the embedder doesn't have any responsibilities.

asajeffrey
asajeffrey approved these changes Aug 12, 2019
View reviewed changes
Copy link
Member

@asajeffrey asajeffrey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of questions, but no show-stoppers. You can r=me.

ports/libsimpleservo/api/Cargo.toml Show resolved Hide resolved
ports/libsimpleservo/api/src/lib.rs Outdated Show resolved Hide resolved
@Manishearth
Copy link
Member Author

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

📌 Commit bb552cc has been approved by asajeffrey

@highfive highfive assigned asajeffrey and unassigned jdm Aug 12, 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. S-needs-rebase There are merge conflict errors. labels Aug 12, 2019
@bors-servo
Copy link
Contributor

⌛ Testing commit bb552cc with merge 38772d9...

bors-servo pushed a commit that referenced this pull request Aug 12, 2019
Auto merge of #23945 - Manishearth:hl-xr-immersive, r=asajeffrey
38772d9 
Immersive WebXR on Hololens

This PR adds support to the OpenXR backend (servo/webxr#37) for Hololens. We support _entering_ immersive mode, but currently do nothing in immersive mode (servo/webxr#38, applying https://github.com/servo/webxr/tree/d3d11-draw should render some red).

This should be ready to land as-is aside from its dependency on #23922. It can be tested on https://manishearth.github.io/webgl-to-webxr/webxr-ar.html (make sure to click through the alerts).

This is based on #23922 .

This builds off of @paulrouget's work.

r? @jdm @paulrouget

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

💔 Test failed - linux-rel-wpt

@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 12, 2019
bors-servo pushed a commit that referenced this pull request Aug 12, 2019
Auto merge of #23945 - Manishearth:hl-xr-immersive, r=asajeffrey
22a870d 
Immersive WebXR on Hololens

This PR adds support to the OpenXR backend (servo/webxr#37) for Hololens. We support _entering_ immersive mode, but currently do nothing in immersive mode (servo/webxr#38, applying https://github.com/servo/webxr/tree/d3d11-draw should render some red).

This should be ready to land as-is aside from its dependency on #23922. It can be tested on https://manishearth.github.io/webgl-to-webxr/webxr-ar.html (make sure to click through the alerts).

This is based on #23922 .

This builds off of @paulrouget's work.

r? @jdm @paulrouget

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

💔 Test failed - status-taskcluster

@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 Aug 12, 2019
@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 Aug 12, 2019
@Manishearth
Copy link
Member Author

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

📌 Commit 6395e85 has been approved by asajeffrey

@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 Aug 12, 2019
@bors-servo
Copy link
Contributor

⌛ Testing commit 6395e85 with merge 1852344...

bors-servo pushed a commit that referenced this pull request Aug 12, 2019
Auto merge of #23945 - Manishearth:hl-xr-immersive, r=asajeffrey
1852344 
Immersive WebXR on Hololens

This PR adds support to the OpenXR backend (servo/webxr#37) for Hololens. We support _entering_ immersive mode, but currently do nothing in immersive mode (servo/webxr#38, applying https://github.com/servo/webxr/tree/d3d11-draw should render some red).

This should be ready to land as-is aside from its dependency on #23922. It can be tested on https://manishearth.github.io/webgl-to-webxr/webxr-ar.html (make sure to click through the alerts).

This is based on #23922 .

This builds off of @paulrouget's work.

r? @jdm @paulrouget

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

💔 Test failed - status-taskcluster

@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 Aug 13, 2019
@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 Aug 13, 2019
@Manishearth
Copy link
Member Author

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

📌 Commit c879ce0 has been approved by asajeffrey

@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 Aug 13, 2019
@bors-servo
Copy link
Contributor

⌛ Testing commit c879ce0 with merge 9b24798...

bors-servo pushed a commit that referenced this pull request Aug 13, 2019
Auto merge of #23945 - Manishearth:hl-xr-immersive, r=asajeffrey
9b24798 
Immersive WebXR on Hololens

This PR adds support to the OpenXR backend (servo/webxr#37) for Hololens. We support _entering_ immersive mode, but currently do nothing in immersive mode (servo/webxr#38, applying https://github.com/servo/webxr/tree/d3d11-draw should render some red).

This should be ready to land as-is aside from its dependency on #23922. It can be tested on https://manishearth.github.io/webgl-to-webxr/webxr-ar.html (make sure to click through the alerts).

This is based on #23922 .

This builds off of @paulrouget's work.

r? @jdm @paulrouget

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

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: asajeffrey
Pushing 9b24798 to master...

@bors-servo bors-servo merged commit c879ce0 into servo:master Aug 13, 2019
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm jdm left review comments

@paulrouget paulrouget paulrouget left review comments

@asajeffrey asajeffrey asajeffrey approved these changes

Assignees

@asajeffrey asajeffrey

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Manishearth @highfive @bors-servo @jdm @paulrouget @asajeffrey