Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upAdd Servo3D immersive demo for magicleap #23546
Merged
Conversation
highfive
commented
Jun 10, 2019
|
Heads up! This PR modifies the following files:
|
|
Sigh, dupes: |
|
Deduped. Thanks @Eijebong! |
|
r? @Manishearth |
|
r=me, haven't looked too closely at the cpp but it seems fine. |
asajeffrey
force-pushed the
asajeffrey:magicleap-webvr-second-cut
branch
from
125b20d
to
cdd6f3b
|
|
bors-servo
added a commit
that referenced
this pull request
Jun 12, 2019
…shearth Add Servo3D immersive demo for magicleap <!-- Please describe your changes on the following line: --> An immersive mode demo for magicleap. --- <!-- 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 (apart from dupes, sigh) - [X] These changes fix #22402 (GitHub issue number if applicable) - [X] These changes do not require tests because it's a new platform <!-- 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/23546) <!-- Reviewable:end -->
|
@bors-servo r=Manishearth |
|
|
bors-servo
added a commit
that referenced
this pull request
Jun 12, 2019
…hearth Add Servo3D immersive demo for magicleap <!-- Please describe your changes on the following line: --> An immersive mode demo for magicleap. --- <!-- 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 (apart from dupes, sigh) - [X] These changes fix #22402 (GitHub issue number if applicable) - [X] These changes do not require tests because it's a new platform <!-- 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/23546) <!-- Reviewable:end -->
|
|
|
In Android ARM build: error[E0061]: this function takes 3 parameters but 4 parameters were supplied
--> ports/libsimpleservo/jniapi/src/lib.rs:109:44
|
109 | gl_glue::egl::init().and_then(|gl| simpleservo::init(opts, gl, wakeup, callbacks))
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 3 parameters
error[E0560]: struct `simpleservo::InitOptions` has no field named `vr_pointer`
--> ports/libsimpleservo/jniapi/src/lib.rs:699:9
|
699 | vr_pointer: if vr_pointer.is_null() {
| ^^^^^^^^^^ `simpleservo::InitOptions` does not have this field
|
= note: available fields are: `args`, `url`, `coordinates`, `density`, `embedder_callbacks`, `enable_subpixel_text_antialiasing`
error: aborting due to 2 previous errorsIn Linux Tidy and Windows build: + ./mach build --dev --libsimpleservo
Downloading crates ...
Downloaded cbindgen v0.8.0
Compiling simpleservo v0.0.1 (/repo/ports/libsimpleservo/api)
Compiling rust-webvr v0.11.4
Compiling cbindgen v0.8.0
Compiling webvr v0.0.1 (/repo/components/webvr)
Compiling compositing v0.0.1 (/repo/components/compositing)
Compiling simpleservo_capi v0.0.1 (/repo/ports/libsimpleservo/capi)
Compiling canvas v0.0.1 (/repo/components/canvas)
Compiling constellation v0.0.1 (/repo/components/constellation)
Compiling libservo v0.0.1 (/repo/components/servo)
error[E0560] : struct `simpleservo::InitOptions` has no field named `vr_pointer`
--> ports/libsimpleservo/capi/src/lib.rs:99:9
|
99 | vr_pointer: if opts.vr_pointer.is_null() {
| ^^^^^^^^^^ `simpleservo::InitOptions` does not have this field
|
= note : available fields are: `args`, `url`, `coordinates`, `density`, `embedder_callbacks`, `enable_subpixel_text_antialiasing`
error[E0061] : this function takes 3 parameters but 4 parameters were supplied
--> ports/libsimpleservo/capi/src/lib.rs:110:5
|
110 | simpleservo::init(opts, gl, wakeup, callbacks).unwrap();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 3 parameters
error : aborting due to 2 previous errors
Some errors have detailed explanations: E0061, E0560.
For more information about an error, try `rustc --explain E0061`.
error: Could not compile `simpleservo_capi`. |
|
Yeah, my changes to libsimpleservo didn't get reflected in the other embeddings. |
bors-servo
added a commit
that referenced
this pull request
Jun 13, 2019
…hearth Add Servo3D immersive demo for magicleap <!-- Please describe your changes on the following line: --> An immersive mode demo for magicleap. --- <!-- 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 (apart from dupes, sigh) - [X] These changes fix #22402 (GitHub issue number if applicable) - [X] These changes do not require tests because it's a new platform <!-- 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/23546) <!-- Reviewable:end -->
asajeffrey
force-pushed the
asajeffrey:magicleap-webvr-second-cut
branch
from
9c9b677
to
010eff2
|
Hmm, the build never finished, let's try again.@bors-servo r=Manishearth |
|
|
bors-servo
added a commit
that referenced
this pull request
Jun 13, 2019
Add Servo3D immersive demo for magicleap <!-- Please describe your changes on the following line: --> An immersive mode demo for magicleap. --- <!-- 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 (apart from dupes, sigh) - [X] These changes fix #22402 (GitHub issue number if applicable) - [X] These changes do not require tests because it's a new platform <!-- 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/23546) <!-- Reviewable:end -->
|
https://treeherder.allizom.org/#/jobs?repo=servo-auto&revision=98d3dbb3776d128f7738cba9953e121a14003f56 has failures from last time. |
|
I think I fixed those in the most recent force-push. |
asajeffrey
force-pushed the
asajeffrey:magicleap-webvr-second-cut
branch
from
010eff2
to
0b48ff4
|
And that last fix broke test-tidy. Of course it did. @bors-servo r=Manishearth |
|
|
|
@bors-servo try- |
bors-servo
added a commit
that referenced
this pull request
Jun 13, 2019
…hearth Add Servo3D immersive demo for magicleap <!-- Please describe your changes on the following line: --> An immersive mode demo for magicleap. --- <!-- 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 (apart from dupes, sigh) - [X] These changes fix #22402 (GitHub issue number if applicable) - [X] These changes do not require tests because it's a new platform <!-- 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/23546) <!-- Reviewable:end -->
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
asajeffrey commentedJun 10, 2019
•
edited by SimonSapin
An immersive mode demo for magicleap.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errors (apart from dupes, sigh)This change is