wip

Cargo.toml

@@ -14,8 +14,14 @@ opt-level = 3
 # debug = true
 # lto = false
 
-[patch.crates-io]
+#[patch.crates-io]
 # If you need to temporarily test Servo with a local fork of some upstream
 # crate, add that here. Use the form:
 #
 #     <crate> = { path = "/path/to/local/checkout" }
+
+[replace]
+"rust-webvr:0.6.1" = { path = "/home/mortimer/Projects/rust-webvr" }
+"https://github.com/servo/webrender#0.48.0" = { path = '/home/mortimer/Projects/1ec6fb9/webrender' }
+"https://github.com/servo/webrender#webrender_api:0.48.0" = { path = '/home/mortimer/Projects/1ec6fb9/webrender_api' }
+"offscreen_gl_context:0.11.0" = { path = "/home/mortimer/Projects/rust-offscreen-rendering-context" }

components/canvas/webgl_thread.rs

@@ -195,6 +195,7 @@ impl<VR: WebVRRenderHandler + 'static, OB: WebGLThreadObserver> WebGLThread<VR,
         let result = self.gl_factory.new_shared_context(size, attributes)
                                     .map(|r| (r, WebGLContextShareMode::SharedTexture))
                                     .or_else(|_| {
+                                        panic!("readback");
                                         let ctx = self.gl_factory.new_context(size, attributes);
                                         ctx.map(|r| (r, WebGLContextShareMode::Readback))
                                     });
@@ -502,8 +503,8 @@ impl<T: WebGLExternalImageApi> webrender::ExternalImageHandler for WebGLExternal
         webrender::ExternalImage {
             u0: 0.0,
             u1: size.width as f32,
-            v1: 0.0,
-            v0: size.height as f32,
+            v0: 0.0,
+            v1: size.height as f32,
             source: webrender::ExternalImageSource::NativeTexture(texture_id),
         }
 
@@ -763,8 +764,8 @@ impl WebGLImpl {
 
         // TODO: update test expectations in order to enable debug assertions
         //if cfg!(debug_assertions) {
-            let error = ctx.gl().get_error();
-            assert!(error == gl::NO_ERROR, "Unexpected WebGL error: 0x{:x} ({})", error, error);
+            //let error = ctx.gl().get_error();
+            //assert!(error == gl::NO_ERROR, "Unexpected WebGL error: 0x{:x} ({})", error, error);
         //}
     }
 

components/script/dom/webglrenderingcontext.rs

@@ -278,10 +278,10 @@ impl WebGLRenderingContext {
         // NativeContext handling library changes the scissor after a resize, so we need to reset the
         // default scissor when the canvas was created or the last scissor that the user set.
         let rect = self.current_scissor.get();
-        self.send_comand(WebGLCommand::Scissor(rect.0, rect.1, rect.2, rect.3));
+        self.send_command(WebGLCommand::Scissor(rect.0, rect.1, rect.2, rect.3));
 
         if let Some(id) = self.bound_texture_2d.get() {
-            self.send_comand(WebGLCommand::BindTexture(constants::TEXTURE_2D, Some(id.id())));
+            self.send_command(WebGLCommand::BindTexture(constants::TEXTURE_2D, Some(id.id())));
         }
     }
 

components/webvr_traits/Cargo.toml

@@ -12,5 +12,5 @@ path = "lib.rs"
 [dependencies]
 ipc-channel = "0.8"
 msg = {path = "../msg"}
-rust-webvr = {version = "0.5", features = ["serde-serialization"]}
+rust-webvr = {version = "0.6", features = ["serde-serialization", "oculusvr"]}
 serde = "1.0"

support/android/apk/app/build.gradle

@@ -175,9 +175,11 @@ android {
 }
 
 dependencies {
-    compile 'com.google.vr:sdk-base:1.30.0'
-    compile 'com.google.vr:sdk-audio:1.30.0'
-    compile project(':GVRService')
+    //compile 'com.google.vr:sdk-base:1.30.0'
+    //compile 'com.google.vr:sdk-audio:1.30.0'
+    //compile project(':GVRService')
+
+    compile project(':OVRService')
 
     //Dependency list
     def deps = [

support/android/apk/app/src/main/AndroidManifest.xml

@@ -12,18 +12,17 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
 
     <application android:label="Servo" android:icon="@mipmap/servo">
+        <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
         <activity android:name=".MainActivity"
                 android:label="Servo"
             android:launchMode="singleTop"
                 android:screenOrientation="landscape"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:enableVrMode="@string/gvr_vr_mode_component"
                 android:resizeableActivity="false">
             <meta-data android:name="android.app.lib_name" android:value="servo" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="com.google.intent.category.DAYDREAM"/>
             </intent-filter>
 
             <!-- Web browser intents -->

support/android/apk/app/src/main/java/com/mozilla/servo/MainActivity.java

@@ -46,8 +46,9 @@ public class MainActivity extends android.app.NativeActivity {
         Log.i(LOGTAG, "Loading the NativeActivity");
 
         // Libaries should be loaded in reverse dependency order
-        System.loadLibrary("gvr");
-        System.loadLibrary("gvr_audio");
+        //System.loadLibrary("gvr");
+        //System.loadLibrary("gvr_audio");
+        System.loadLibrary("vrapi");
         System.loadLibrary("c++_shared");
         System.loadLibrary("servo");
     }

support/android/apk/settings.gradle

@@ -1,3 +1,5 @@
 include ':app'
-include ':GVRService'
-project(':GVRService').projectDir = new File('/home/mortimer/Projects/rust-webvr/src/api/googlevr/gradle')
+//include ':GVRService'
+//project(':GVRService').projectDir = new File('/home/mortimer/Projects/rust-webvr/src/api/googlevr/gradle')
+include ':OVRService'
+project(':OVRService').projectDir = new File('/home/mortimer/Projects/rust-webvr/src/api/oculusvr/gradle')