Add ARM support

webrender/res/ps_image_clip.fs.glsl

@@ -6,15 +6,15 @@
 
 void main(void) {
 #ifdef WR_FEATURE_TRANSFORM
-    float alpha = 1;
+    float alpha = 1.f;
     vec2 local_pos = init_transform_fs(vLocalPos, vLocalRect, alpha);
 
     // We clamp the texture coordinate calculation here to the local rectangle boundaries,
     // which makes the edge of the texture stretch instead of repeat.
     vec2 pos_for_texture =
          clamp(pos, vLocalRect.xy, vLocalRect.xy + vLocalRect.zw) - vLocalRect.xy;
 #else
-    float alpha = 1;
+    float alpha = 1.f;
     vec2 local_pos = vLocalPos;
     vec2 relative_pos_in_rect = vLocalPos - vLocalRect.xy;
 #endif

webrender/res/ps_rectangle_clip.fs.glsl

@@ -4,10 +4,10 @@
 
 void main(void) {
 #ifdef WR_FEATURE_TRANSFORM
-    float alpha = 1;
+    float alpha = 1.f;
     vec2 local_pos = init_transform_fs(vPos, vLocalRect, alpha);
 #else
-    float alpha = 1;
+    float alpha = 1.f;
     vec2 local_pos = vPos;
 #endif
 

webrender/src/device.rs

@@ -19,10 +19,10 @@ use std::mem;
 //use std::thread;
 use webrender_traits::ImageFormat;
 
-#[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+#[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
 const GL_FORMAT_A: gl::GLuint = gl::RED;
 
-#[cfg(target_os = "android")]
+#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
 const GL_FORMAT_A: gl::GLuint = gl::ALPHA;
 
 #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
@@ -31,16 +31,10 @@ const GL_FORMAT_BGRA: gl::GLuint = gl::BGRA;
 #[cfg(target_os = "android")]
 const GL_FORMAT_BGRA: gl::GLuint = gl::BGRA_EXT;
 
-#[cfg(target_os = "linux")]
-const SHADER_VERSION: &'static str = "#version 150\n";
-
-#[cfg(target_os = "macos")]
-const SHADER_VERSION: &'static str = "#version 150\n";
-
-#[cfg(target_os = "windows")]
+#[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
 const SHADER_VERSION: &'static str = "#version 150\n";
 
-#[cfg(target_os = "android")]
+#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
 const SHADER_VERSION: &'static str = "#version 300 es\n";
 
 static SHADER_PREAMBLE: &'static str = "shared.glsl";
@@ -578,19 +572,19 @@ pub struct VBOId(gl::GLuint);
 #[derive(PartialEq, Eq, Hash, Debug, Copy, Clone)]
 struct IBOId(gl::GLuint);
 
-#[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+#[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
 pub struct GpuProfile {
     next_query: usize,
     qids: Vec<gl::GLuint>,
 }
 
-#[cfg(target_os = "android")]
+#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
 pub struct GpuProfile;
 
 const QUERY_COUNT: i32 = 4;
 
 impl GpuProfile {
-    #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+    #[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
     pub fn new() -> GpuProfile {
         let queries = gl::gen_queries(QUERY_COUNT);
 
@@ -605,41 +599,41 @@ impl GpuProfile {
         }
     }
 
-    #[cfg(target_os = "android")]
+    #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
     pub fn new() -> GpuProfile {
         GpuProfile
     }
 
-    #[cfg(any(target_os = "android", target_os = "gonk"))]
+    #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
     pub fn get(&mut self) -> u64 {
         0
     }
 
-    #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+    #[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
     pub fn get(&mut self) -> u64 {
         let qi = self.next_query;
         gl::get_query_object_ui64v(self.qids[qi], gl::QUERY_RESULT)
     }
 
-    #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+    #[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
     pub fn begin(&mut self) {
         gl::begin_query(gl::TIME_ELAPSED, self.qids[self.next_query]);
     }
 
-    #[cfg(target_os = "android")]
+    #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
     pub fn begin(&mut self) {}
 
-    #[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+    #[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
     pub fn end(&mut self) {
         gl::end_query(gl::TIME_ELAPSED);
         self.next_query = (self.next_query + 1) % QUERY_COUNT as usize;
     }
 
-    #[cfg(target_os = "android")]
+    #[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
     pub fn end(&mut self) -> u64 { 0 }
 }
 
-#[cfg(any(target_os = "linux", target_os = "windows", target_os = "macos"))]
+#[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
 impl Drop for GpuProfile {
     fn drop(&mut self) {
         gl::delete_queries(&self.qids);
@@ -1412,7 +1406,7 @@ impl Device {
 
         let (gl_format, bpp, data) = match self.textures.get(&texture_id).unwrap().format {
             ImageFormat::A8 => {
-                if cfg!(target_os="android") {
+                if cfg!(any(target_arch="arm", target_arch="aarch64")) {
                     for byte in data {
                         expanded_data.push(*byte);
                         expanded_data.push(*byte);
@@ -1620,15 +1614,15 @@ impl Drop for Device {
 fn gl_texture_formats_for_image_format(format: ImageFormat) -> (gl::GLint, gl::GLuint) {
     match format {
         ImageFormat::A8 => {
-            if cfg!(target_os="android") {
+            if cfg!(any(target_arch="arm", target_arch="aarch64")) {
                 (GL_FORMAT_BGRA as gl::GLint, GL_FORMAT_BGRA)
             } else {
                 (GL_FORMAT_A as gl::GLint, GL_FORMAT_A)
             }
         },
         ImageFormat::RGB8 => (gl::RGB as gl::GLint, gl::RGB),
         ImageFormat::RGBA8 => {
-            if cfg!(target_os="android") {
+            if cfg!(any(target_arch="arm", target_arch="aarch64")) {
                 (GL_FORMAT_BGRA as gl::GLint, GL_FORMAT_BGRA)
             } else {
                 (gl::RGBA as gl::GLint, GL_FORMAT_BGRA)