Support building for Magic Leap. #21985

asajeffrey · 2018-10-19T23:43:28Z

This PR gets Servo to build for Magic Leap, and provides a dummy Servo2D app.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes do not require tests because it's a port to a new architecture

This change is

highfive · 2018-10-19T23:43:32Z

Heads up! This PR modifies the following files:

@wafflespeanut: python/servo/build_commands.py
@edunham: servo-tidy.toml
@KiChjang: components/script/Cargo.toml

highfive · 2018-10-19T23:43:33Z

Warning

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

asajeffrey · 2018-10-19T23:44:39Z

It depends on servo/mozjs#158 and servo/media#158.

asajeffrey · 2018-10-22T15:09:47Z

Filed #21999 to get servo-media updated.

jdm · 2018-10-22T20:18:16Z

ports/libmlservo/Cargo.toml

+libservo = { path = "../../components/servo" }
+servo-egl = "0.2"
+log = "0.4"
+smallvec = "0.6"


nit: let's start this in alphabetic order at least.

jdm · 2018-10-22T20:18:16Z

ports/libmlservo/src/lib.rs

+            screen_avail: TypedSize2D::new(500, 500),
+            window: (TypedSize2D::new(500, 500), TypedPoint2D::new(0, 0)),
+                framebuffer: TypedSize2D::new(500, 500),
+                viewport: TypedRect::new(TypedPoint2D::new(0, 0), TypedSize2D::new(500, 500)),


nit: weird indentation.

jdm · 2018-10-22T20:18:16Z

ports/libmlservo/src/lib.rs

+    fn get_coordinates(&self) -> EmbedderCoordinates {
+        EmbedderCoordinates {
+            hidpi_factor: TypedScale::new(1.0),
+                   screen: TypedSize2D::new(500, 500),


Shall we move these magic numbers into constants at least?

jdm · 2018-10-22T20:18:16Z

ports/libmlservo/src/lib.rs

+            Resource::QuirksModeCSS => &include_bytes!("../../../resources/quirks-mode.css")[..],
+            Resource::RippyPNG => &include_bytes!("../../../resources/rippy.png")[..],
+            Resource::DomainList => &include_bytes!("../../../resources/public_domains.txt")[..],
+            Resource::BluetoothBlocklist => &include_bytes!("../../../resources/gatt_blocklist.txt")[..],


Is it worth adding a build script to this crate that forces a rebuild if any of these files are modified?

jdm · 2018-10-22T20:18:16Z

ports/libmlservo/src/lib.rs

+
+impl log::Log for MLLogger {
+    fn enabled(&self, metadata: &log::Metadata) -> bool {
+        metadata.level() <= log::Level::Info


Maybe store the level in a constant so the set_max_level call earlier matches?

jdm · 2018-10-22T20:18:16Z

support/magicleap/Servo2D/code/src/Servo2D.cpp

+
+// The prism dimensions
+const glm::vec3 Servo2D::getInitialPrismExtents() const {
+  return glm::vec3(0.5f, 0.5f, 0.5f);


Do these relate to the 500s in libmlservo, or is that just coincidence?

jdm · 2018-10-22T20:18:16Z

support/magicleap/Servo2D/code/src/Servo2D.cpp

+  lumin::ui::Cursor::SetScale(prism_, 0.03f);
+  instanceInitialScenes();
+
+  // Get the panar resource that holds the EGL context


jdm · 2018-10-22T20:18:16Z

support/magicleap/Servo2D/code/src/Servo2D.cpp

+  EGLSurface surf = plane_->getEGLSurface();
+  EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+  eglMakeCurrent(dpy, surf, surf, ctx);
+  glViewport(0, 0, 500, 500);


Does this need to match the 500s in libmlservo? Can we pass this value in to Rust?

jdm · 2018-10-22T20:18:16Z

support/magicleap/Servo2D/code/src/main.cpp

+int main(int argc, char **argv)
+{
+  ML_LOG(Debug, "Servo2D Starting.");
+  Servo2D myApp;


Does argv contain meaningful values for us? Can we accept a URL on the command line?

jdm · 2018-10-22T20:18:16Z

support/magicleap/Servo2D/code/src/Servo2D.cpp

+  EGLSurface surf = plane_->getEGLSurface();
+  EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+  eglMakeCurrent(dpy, surf, surf, ctx);
+  glViewport(0, 0, 500, 500);


Let's make this a named constant somewhere.

bors-servo · 2018-10-23T16:10:56Z

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

asajeffrey · 2018-10-23T21:15:08Z

I did some fixes, but can't test the C++ code because I'm at home rather than in the office.

asajeffrey · 2018-10-23T21:50:36Z

Rebased.

asajeffrey · 2018-10-23T22:55:28Z

Updated mozjs_sys which was the last external blocker.

paulrouget · 2018-10-24T04:58:37Z

I see that you introduced a new port. Did you consider using the c api of libsimpleservo instead of libmlservo?

asajeffrey · 2018-10-24T13:44:46Z

@paulrouget yes, originally I was using libsimpleservo but ran into horrible linking problems which went away if I used libservo directly. My suspicion is that the ML is going to be a different enough target from Android that we're going to need a different port at some point anyway.

paulrouget · 2018-10-24T15:31:09Z

libsimpleservo can be compiled without any android stuff (it compiles on Desktop for example). It's supposed to be capable of being dynamically loaded like libservo. I'd be interested to know what kind of issues you ran into.

I don't want to block this, but maybe later we could look at how to re-use libsimpleservo for ML.

asajeffrey · 2018-10-24T16:23:09Z

It's been a while, but there was some issue about libsimpleservo being dynamically loaded causing symbols not to be found. I may have fixed that in the mean time, e.g. by statically loading openssl.

ferjm · 2018-10-29T10:10:12Z

support/magicleap/README.md

+
+## Building the Servo2D application
+
+From inside the `ports/magicleap/Servo2D` directory:


s/ports/support

jdm · 2018-10-29T11:19:09Z

@bors-servo delegate+
I'm fine with keeping the question about the URL as a followup.

bors-servo · 2018-10-29T11:19:13Z

✌️ @asajeffrey can now approve this pull request


        Support building for Magic Leap.

asajeffrey · 2018-10-29T13:50:38Z

@bors-servo r=jdm

bors-servo · 2018-10-29T13:50:39Z

📌 Commit dab8f4a has been approved by jdm


        Auto merge of #21985 - asajeffrey:magicleap, r=jdm

Support building for Magic Leap.  This PR gets Servo to build for Magic Leap, and provides a dummy Servo2D app. ---  - [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 it's a port to a new architecture    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21985)

bors-servo · 2018-10-29T14:00:35Z

⌛ Testing commit dab8f4a with merge 0ec0f70...

bors-servo · 2018-10-29T15:12:44Z

☀️ Test successful - android, android-mac, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, status-taskcluster, windows-msvc-dev
Approved by: jdm
Pushing 0ec0f70 to master...

highfive assigned emilio Oct 19, 2018

highfive added the S-awaiting-review label Oct 19, 2018

asajeffrey added the S-blocked-on-external label Oct 22, 2018

jdm assigned jdm and unassigned emilio Oct 22, 2018

jdm requested changes Oct 22, 2018

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Oct 22, 2018

highfive added S-needs-rebase S-awaiting-review and removed S-needs-code-changes labels Oct 23, 2018

asajeffrey force-pushed the asajeffrey:magicleap branch from e261c62 to 5aa2dc5 Oct 23, 2018

asajeffrey changed the title ~~[WIP] Support building for Magic Leap.~~ Support building for Magic Leap. Oct 23, 2018

asajeffrey removed the S-blocked-on-external label Oct 23, 2018

avaer mentioned this pull request Oct 28, 2018

Bugfix LuminOS (ML) Canvas2D fonts exokitxr/exokit#572

Merged

ferjm reviewed Oct 29, 2018

View changes

support/magicleap/README.md Outdated

## Building the Servo2D application

From inside the `ports/magicleap/Servo2D` directory:

This comment has been minimized.

Sign in to view

ferjm Oct 29, 2018
Member

s/ports/support

Support building for Magic Leap.

Loading status checks…

dab8f4a

asajeffrey force-pushed the asajeffrey:magicleap branch from ab2e653 to dab8f4a Oct 29, 2018

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Oct 29, 2018

bors-servo merged commit dab8f4a into servo:master Oct 29, 2018
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Oct 29, 2018

paulrouget mentioned this pull request Oct 29, 2018

ML: Investigate using libsimpleservo instead of libmlservo #22041

Closed

asajeffrey mentioned this pull request Oct 29, 2018

Magic Leap minimum viable demo #22043

Closed

5 of 5 tasks complete

servo / servo

Support building for Magic Leap. #21985

Support building for Magic Leap. #21985

asajeffrey commented Oct 19, 2018 •

edited by SimonSapin

highfive commented Oct 19, 2018

highfive commented Oct 19, 2018

asajeffrey commented Oct 19, 2018

asajeffrey commented Oct 22, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Oct 23, 2018

asajeffrey commented Oct 23, 2018

asajeffrey commented Oct 23, 2018

asajeffrey commented Oct 23, 2018

paulrouget commented Oct 24, 2018

asajeffrey commented Oct 24, 2018

paulrouget commented Oct 24, 2018

asajeffrey commented Oct 24, 2018

This comment has been minimized.

jdm commented Oct 29, 2018

bors-servo commented Oct 29, 2018

asajeffrey commented Oct 29, 2018

bors-servo commented Oct 29, 2018

bors-servo commented Oct 29, 2018

bors-servo commented Oct 29, 2018


		## Building the Servo2D application

		From inside the `ports/magicleap/Servo2D` directory:

servo / servo

Join GitHub today

Support building for Magic Leap. #21985

Support building for Magic Leap. #21985

Conversation

asajeffrey commented Oct 19, 2018 • edited by SimonSapin

highfive commented Oct 19, 2018

highfive commented Oct 19, 2018

asajeffrey commented Oct 19, 2018

asajeffrey commented Oct 22, 2018

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Oct 23, 2018

asajeffrey commented Oct 23, 2018

asajeffrey commented Oct 23, 2018

asajeffrey commented Oct 23, 2018

paulrouget commented Oct 24, 2018

asajeffrey commented Oct 24, 2018

paulrouget commented Oct 24, 2018

asajeffrey commented Oct 24, 2018

This comment has been minimized.

jdm commented Oct 29, 2018

bors-servo commented Oct 29, 2018

asajeffrey commented Oct 29, 2018

bors-servo commented Oct 29, 2018

bors-servo commented Oct 29, 2018

bors-servo commented Oct 29, 2018

asajeffrey commented Oct 19, 2018 •

edited by SimonSapin