Bug 1498650. Update Cargo lockfiles and re-vendor rust dependencies
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Sat, 13 Oct 2018 21:18:42 -0400
changeset 499595 7cbf19248394a63dbbdb707d31e8b265c8a5aca3
parent 499594 08f77e821f0919fa33c0ef47f7dd3ff9e8f1a57d
child 499596 15b1e744df851da63468b58b4a465944342ec8c9
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1498650
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1498650. Update Cargo lockfiles and re-vendor rust dependencies
Cargo.lock
third_party/rust/gleam/.cargo-checksum.json
third_party/rust/gleam/.travis.yml
third_party/rust/gleam/COPYING
third_party/rust/gleam/Cargo.toml
third_party/rust/gleam/LICENSE-APACHE
third_party/rust/gleam/LICENSE-MIT
third_party/rust/gleam/README.md
third_party/rust/gleam/build.rs
third_party/rust/gleam/src/gl.rs
third_party/rust/gleam/src/gl_fns.rs
third_party/rust/gleam/src/gles_fns.rs
third_party/rust/gleam/src/lib.rs
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1035,17 +1035,17 @@ source = "registry+https://github.com/ru
 dependencies = [
  "khronos_api 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "gleam"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "glob"
 version = "0.2.11"
@@ -2891,17 +2891,17 @@ dependencies = [
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-text 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "plane-split 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2935,17 +2935,17 @@ dependencies = [
  "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-foundation 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "core-graphics 0.17.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "dwrote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "nsstring 0.1.0",
  "rayon 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_profiler 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "uuid 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender 0.57.2",
 ]
 
@@ -3161,17 +3161,17 @@ dependencies = [
 "checksum fs2 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum futures 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "884dbe32a6ae4cd7da5c6db9b78114449df9953b8d490c9d7e1b51720b922c62"
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
 "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
 "checksum gl_generator 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a795170cbd85b5a7baa58d6d7525cae6a03e486859860c220f7ebbbdd379d0a"
-"checksum gleam 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "24ba6539d49223f6bca4f076d9490c001bdbfe07d59cb0ad4079033c75bdc92d"
+"checksum gleam 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2260952cc0393ca6f183e1a91a035c65c85ddb02505f3d53e5a775eb05946f44"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum goblin 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "5911d7df7b8f65ab676c5327b50acea29d3c6a1a4ad05e444cf5dce321b26db2"
 "checksum h2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "a27e7ed946e8335bdf9a191bc1b9b14a03ba822d013d2f58437f4fabcbd7fc2c"
 "checksum http 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "dca621d0fa606a5ff2850b6e337b57ad6137ee4d67e940449643ff45af6874c6"
 "checksum httparse 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "af2f2dd97457e8fb1ae7c5a420db346af389926e36f43768b96f101546b04a07"
 "checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"
 "checksum hyper 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c087746de95e20e4dabe86606c3a019964a8fde2d5f386152939063c116c5971"
 "checksum ident_case 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c9826188e666f2ed92071d2dadef6edc430b11b158b5b2b3f4babbcc891eaaa"
--- a/third_party/rust/gleam/.cargo-checksum.json
+++ b/third_party/rust/gleam/.cargo-checksum.json
@@ -1,1 +1,1 @@
-{"files":{".travis.yml":"29b74b95210896ce634c11a9037638668473b5a1b3b1716c505cb04dbb6341fa","COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"1ce5db6eca31db47eae42f9e0dc77111ae1d009fa4e83e198db678fe9d4add6e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"2de24b7458d6b88f20324303a48acf64a4f2bbfb83d2ec4d6ff2b4f4a1fd2275","build.rs":"e155f5d7f71fe10d18e108fe6557f31ae5fec425a3acbdf564b02b0bc695fde4","src/gl.rs":"c6f265cdff942c2017feebacb385a6a186c396cc8f44985803a83f8f73c2ce6b","src/gl_fns.rs":"58a8ab3e82d2d582874e95465ce44e0827d48f846668bc9620978d6748ea0255","src/gles_fns.rs":"4b1eb8eaacdd5514c3a93ab77403e4232d8a680452311c120b9340ab94a4a0b9","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"24ba6539d49223f6bca4f076d9490c001bdbfe07d59cb0ad4079033c75bdc92d"}
\ No newline at end of file
+{"files":{".travis.yml":"29b74b95210896ce634c11a9037638668473b5a1b3b1716c505cb04dbb6341fa","COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"0b59acef8c840e73d2c3ade921cac7fab2c0d26db5535fa320d965fd434e7184","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"2de24b7458d6b88f20324303a48acf64a4f2bbfb83d2ec4d6ff2b4f4a1fd2275","build.rs":"5dfbe1a39fdb8b91c91cef0581de3c62aa9617afe8427a5837cc7bc90e681adb","src/gl.rs":"84e1cdf6ad785de343b1b14398a5a75c94a12e43e5f1bc8e12d9cc5036468bf5","src/gl_fns.rs":"2c16ca840c519cd6bf73ced3a8334cbadd40e1d79c9eba47a4c67dbac729c222","src/gles_fns.rs":"b3cf28f9530948a13d55e79dd4310e3bb2deb3445c0d0076e19d81994d1230d8","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"2260952cc0393ca6f183e1a91a035c65c85ddb02505f3d53e5a775eb05946f44"}
\ No newline at end of file
old mode 100644
new mode 100755
old mode 100644
new mode 100755
--- a/third_party/rust/gleam/Cargo.toml
+++ b/third_party/rust/gleam/Cargo.toml
@@ -7,17 +7,17 @@
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
 # editing this file be aware that the upstream Cargo.toml
 # will likely look very different (and much more reasonable)
 
 [package]
 name = "gleam"
-version = "0.6.2"
+version = "0.6.3"
 authors = ["The Servo Project Developers"]
 build = "build.rs"
 description = "Generated OpenGL bindings and wrapper for Servo."
 documentation = "http://doc.servo.org/gleam/"
 license = "Apache-2.0/MIT"
 repository = "https://github.com/servo/gleam"
 [build-dependencies.gl_generator]
 version = "0.9"
old mode 100644
new mode 100755
old mode 100644
new mode 100755
old mode 100644
new mode 100755
old mode 100644
new mode 100755
--- a/third_party/rust/gleam/build.rs
+++ b/third_party/rust/gleam/build.rs
@@ -13,32 +13,35 @@ fn main() {
 
     // OpenGL 3.3 bindings
     let gl_extensions = [
         "GL_APPLE_client_storage",
         "GL_APPLE_fence",
         "GL_APPLE_texture_range",
         "GL_ARB_blend_func_extended",
         "GL_ARB_get_program_binary",
+        "GL_ARB_invalidate_subdata",
         "GL_ARB_texture_rectangle",
+        "GL_ARB_texture_storage",
         "GL_EXT_debug_marker",
         "GL_EXT_texture_filter_anisotropic",
         "GL_KHR_debug",
     ];
     let gl_reg = Registry::new(Api::Gl, (3, 3), Profile::Core, Fallbacks::All, gl_extensions);
     gl_reg.write_bindings(gl_generator::StructGenerator, &mut file_gl)
         .unwrap();
 
     // GLES 3.0 bindings
     let gles_extensions = [
         "GL_EXT_debug_marker",
         "GL_EXT_disjoint_timer_query",
         "GL_EXT_shader_texture_lod",
         "GL_EXT_texture_filter_anisotropic",
         "GL_EXT_texture_format_BGRA8888",
+        "GL_EXT_texture_storage",
         "GL_KHR_debug",
         "GL_OES_EGL_image_external",
         "GL_OES_EGL_image",
     ];
     let gles_reg = Registry::new(Api::Gles2, (3, 0), Profile::Core, Fallbacks::All, gles_extensions);
     gles_reg.write_bindings(gl_generator::StructGenerator, &mut file_gles)
         .unwrap();
 
old mode 100644
new mode 100755
--- a/third_party/rust/gleam/src/gl.rs
+++ b/third_party/rust/gleam/src/gl.rs
@@ -278,23 +278,47 @@ declare_gl_apis! {
                             yoffset: GLint,
                             zoffset: GLint,
                             width: GLsizei,
                             height: GLsizei,
                             depth: GLsizei,
                             format: GLenum,
                             ty: GLenum,
                             offset: usize);
+    fn tex_storage_2d(&self,
+                      target: GLenum,
+                      levels: GLint,
+                      internal_format: GLenum,
+                      width: GLsizei,
+                      height: GLsizei);
+    fn tex_storage_3d(&self,
+                      target: GLenum,
+                      levels: GLint,
+                      internal_format: GLenum,
+                      width: GLsizei,
+                      height: GLsizei,
+                      depth: GLsizei);
     fn get_tex_image_into_buffer(&self,
                                 target: GLenum,
                                 level: GLint,
                                 format: GLenum,
                                 ty: GLenum,
                                 output: &mut [u8]);
 
+    fn invalidate_framebuffer(&self,
+                              target: GLenum,
+                              attachments: &[GLenum]);
+    fn invalidate_sub_framebuffer(&self,
+                                  target: GLenum,
+                                  attachments: &[GLenum],
+                                  xoffset: GLint,
+                                  yoffset: GLint,
+                                  width: GLsizei,
+                                  height: GLsizei);
+
     unsafe fn get_integer_v(&self, name: GLenum, result: &mut [GLint]);
     unsafe fn get_integer_64v(&self, name: GLenum, result: &mut [GLint64]);
     unsafe fn get_integer_iv(&self, name: GLenum, index: GLuint, result: &mut [GLint]);
     unsafe fn get_integer_64iv(&self, name: GLenum, index: GLuint, result: &mut [GLint64]);
     unsafe fn get_boolean_v(&self, name: GLenum, result: &mut [GLboolean]);
     unsafe fn get_float_v(&self, name: GLenum, result: &mut [GLfloat]);
 
     fn get_framebuffer_attachment_parameter_iv(&self,
old mode 100644
new mode 100755
--- a/third_party/rust/gleam/src/gl_fns.rs
+++ b/third_party/rust/gleam/src/gl_fns.rs
@@ -610,31 +610,104 @@ impl Gl for GlFns {
                                        height,
                                        depth,
                                        format,
                                        ty,
                                        offset as *const c_void);
         }
     }
 
+    fn tex_storage_2d(&self,
+                      target: GLenum,
+                      levels: GLint,
+                      internal_format: GLenum,
+                      width: GLsizei,
+                      height: GLsizei) {
+        if self.ffi_gl_.TexStorage2D.is_loaded() {
+            unsafe {
+                self.ffi_gl_.TexStorage2D(target,
+                                          levels,
+                                          internal_format,
+                                          width,
+                                          height);
+            }
+        }
+    }
+
+    fn tex_storage_3d(&self,
+                      target: GLenum,
+                      levels: GLint,
+                      internal_format: GLenum,
+                      width: GLsizei,
+                      height: GLsizei,
+                      depth: GLsizei) {
+        if self.ffi_gl_.TexStorage3D.is_loaded() {
+            unsafe {
+                self.ffi_gl_.TexStorage3D(target,
+                                          levels,
+                                          internal_format,
+                                          width,
+                                          height,
+                                          depth);
+            }
+        }
+    }
+
+
     fn get_tex_image_into_buffer(&self,
                                  target: GLenum,
                                  level: GLint,
                                  format: GLenum,
                                  ty: GLenum,
                                  output: &mut [u8]) {
         unsafe {
             self.ffi_gl_.GetTexImage(target,
                                      level,
                                      format,
                                      ty,
                                      output.as_mut_ptr() as *mut _);
         }
     }
 
+    fn invalidate_framebuffer(&self,
+                              target: GLenum,
+                              attachments: &[GLenum]) {
+        if self.ffi_gl_.InvalidateFramebuffer.is_loaded() {
+            unsafe {
+                self.ffi_gl_.InvalidateFramebuffer(
+                    target,
+                    attachments.len() as GLsizei,
+                    attachments.as_ptr(),
+                );
+            }
+        }
+    }
+
+    fn invalidate_sub_framebuffer(&self,
+                                  target: GLenum,
+                                  attachments: &[GLenum],
+                                  xoffset: GLint,
+                                  yoffset: GLint,
+                                  width: GLsizei,
+                                  height: GLsizei) {
+        if self.ffi_gl_.InvalidateSubFramebuffer.is_loaded() {
+            unsafe {
+                self.ffi_gl_.InvalidateSubFramebuffer(
+                    target,
+                    attachments.len() as GLsizei,
+                    attachments.as_ptr(),
+                    xoffset,
+                    yoffset,
+                    width,
+                    height,
+                );
+            }
+        }
+    }
+
     #[inline]
     unsafe fn get_integer_v(&self, name: GLenum, result: &mut [GLint]) {
         assert!(!result.is_empty());
         self.ffi_gl_.GetIntegerv(name, result.as_mut_ptr());
     }
 
     #[inline]
     unsafe fn get_integer_64v(&self, name: GLenum, result: &mut [GLint64]) {
old mode 100644
new mode 100755
--- a/third_party/rust/gleam/src/gles_fns.rs
+++ b/third_party/rust/gleam/src/gles_fns.rs
@@ -634,26 +634,90 @@ impl Gl for GlesFns {
                                        height,
                                        depth,
                                        format,
                                        ty,
                                        offset as *const c_void);
         }
     }
 
+    fn tex_storage_2d(&self,
+                      target: GLenum,
+                      levels: GLint,
+                      internal_format: GLenum,
+                      width: GLsizei,
+                      height: GLsizei) {
+        unsafe {
+            self.ffi_gl_.TexStorage2D(target,
+                                      levels,
+                                      internal_format,
+                                      width,
+                                      height);
+        }
+    }
+
+    fn tex_storage_3d(&self,
+                      target: GLenum,
+                      levels: GLint,
+                      internal_format: GLenum,
+                      width: GLsizei,
+                      height: GLsizei,
+                      depth: GLsizei) {
+        unsafe {
+            self.ffi_gl_.TexStorage3D(target,
+                                      levels,
+                                      internal_format,
+                                      width,
+                                      height,
+                                      depth);
+        }
+    }
+
     #[allow(unused_variables)]
     fn get_tex_image_into_buffer(&self,
                                  target: GLenum,
                                  level: GLint,
                                  format: GLenum,
                                  ty: GLenum,
                                  output: &mut [u8]) {
         panic!("not supported");
     }
 
+    fn invalidate_framebuffer(&self,
+                              target: GLenum,
+                              attachments: &[GLenum]) {
+        unsafe {
+            self.ffi_gl_.InvalidateFramebuffer(
+                target,
+                attachments.len() as GLsizei,
+                attachments.as_ptr(),
+            );
+        }
+    }
+
+    fn invalidate_sub_framebuffer(&self,
+                                  target: GLenum,
+                                  attachments: &[GLenum],
+                                  xoffset: GLint,
+                                  yoffset: GLint,
+                                  width: GLsizei,
+                                  height: GLsizei) {
+        unsafe {
+            self.ffi_gl_.InvalidateSubFramebuffer(
+                target,
+                attachments.len() as GLsizei,
+                attachments.as_ptr(),
+                xoffset,
+                yoffset,
+                width,
+                height,
+            );
+        }
+    }
+
     #[inline]
     unsafe fn get_integer_v(&self, name: GLenum, result: &mut [GLint]) {
         assert!(!result.is_empty());
         self.ffi_gl_.GetIntegerv(name, result.as_mut_ptr());
     }
 
     #[inline]
     unsafe fn get_integer_64v(&self, name: GLenum, result: &mut [GLint64]) {
old mode 100644
new mode 100755