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

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 commented Aug 10, 2019

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

highfive commented Aug 10, 2019

Heads up! This PR modifies the following files:

@highfive
Copy link

highfive commented Aug 10, 2019

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!
@Manishearth Manishearth force-pushed the Manishearth:hl-xr-immersive branch from a74de2f to 32f0a5a Aug 10, 2019
Cargo.toml Outdated Show resolved Hide resolved
@Manishearth Manishearth force-pushed the Manishearth:hl-xr-immersive branch 3 times, most recently from a6fab13 to bc5a045 Aug 10, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Aug 10, 2019

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

@Manishearth Manishearth force-pushed the Manishearth:hl-xr-immersive branch 4 times, most recently from 1a99095 to 93bf247 Aug 10, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Aug 12, 2019

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.

Copy link
Member

asajeffrey left a comment

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 Manishearth force-pushed the Manishearth:hl-xr-immersive branch from 93bf247 to bb552cc Aug 12, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Aug 12, 2019

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Aug 12, 2019

📌 Commit bb552cc has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Aug 12, 2019

Testing commit bb552cc with merge 38772d9...

bors-servo added a commit that referenced this pull request Aug 12, 2019
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

bors-servo commented Aug 12, 2019

💔 Test failed - linux-rel-wpt

bors-servo added a commit that referenced this pull request Aug 12, 2019
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

bors-servo commented Aug 12, 2019

💔 Test failed - status-taskcluster

@Manishearth Manishearth force-pushed the Manishearth:hl-xr-immersive branch from 4452e3c to 6395e85 Aug 12, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Aug 12, 2019

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Aug 12, 2019

📌 Commit 6395e85 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Aug 12, 2019

Testing commit 6395e85 with merge 1852344...

bors-servo added a commit that referenced this pull request Aug 12, 2019
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

bors-servo commented Aug 13, 2019

💔 Test failed - status-taskcluster

@Manishearth Manishearth force-pushed the Manishearth:hl-xr-immersive branch from 6395e85 to c879ce0 Aug 13, 2019
@Manishearth
Copy link
Member Author

Manishearth commented Aug 13, 2019

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Aug 13, 2019

📌 Commit c879ce0 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented Aug 13, 2019

Testing commit c879ce0 with merge 9b24798...

bors-servo added a commit that referenced this pull request Aug 13, 2019
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

bors-servo commented Aug 13, 2019

☀️ 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
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/appveyor/pr AppVeyor build failed
Details
Taskcluster (pull_request) TaskGroup: success
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.

None yet

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