Bug 1630480 - Update gleam GL bindings to 0.11.0 r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D71133

--HG--
extra : moz-landing-system : lando

Cargo.lock

@@ -1757,9 +1757,9 @@ dependencies = [
 
 [[package]]
 name = "gleam"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77b1fd76468fff720bad31016688b805c6442ebf2d7c29123e10e4984aa61986"
+checksum = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
 dependencies = [
  "gl_generator",
 ]

gfx/webrender_bindings/Cargo.toml

@@ -13,7 +13,7 @@ num_cpus = "1.7.0"
 tracy-rs = "0.1"
 euclid = { version = "0.20.8", features = ["serde"] }
 app_units = "0.7"
-gleam = "0.10.0"
+gleam = "0.11.0"
 log = "0.4"
 nsstring = { path = "../../xpcom/rust/nsstring" }
 bincode = "1.0"

gfx/wr/Cargo.lock

@@ -247,7 +247,7 @@ name = "compositor"
 version = "0.1.0"
 dependencies = [
  "compositor-windows 0.1.0",
- "gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender 0.61.0",
 ]
 
@@ -425,7 +425,7 @@ name = "direct-composition"
 version = "0.1.0"
 dependencies = [
  "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "mozangle 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender 0.61.0",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -606,7 +606,7 @@ dependencies = [
 
 [[package]]
 name = "gleam"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1516,7 +1516,7 @@ name = "swgl"
 version = "0.1.0"
 dependencies = [
  "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glsl-to-cxx 0.1.0",
  "webrender_build 0.0.1",
 ]
@@ -1742,7 +1742,7 @@ dependencies = [
  "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "freetype 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.23.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1775,7 +1775,7 @@ dependencies = [
  "core-foundation 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "webrender 0.61.0",
@@ -1896,7 +1896,7 @@ dependencies = [
  "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "font-loader 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "image 0.23.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2044,7 +2044,7 @@ dependencies = [
 "checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
 "checksum gl_generator 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a"
 "checksum gl_generator 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d"
-"checksum gleam 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "77b1fd76468fff720bad31016688b805c6442ebf2d7c29123e10e4984aa61986"
+"checksum gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
 "checksum gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
 "checksum glsl 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "766443890761b3c4edcce86cafaac97971b200662fbdd0446eb7c6b99b4401ea"
 "checksum glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"

gfx/wr/direct-composition/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 
 [target.'cfg(windows)'.dependencies]
 euclid = "0.20"
-gleam = "0.10"
+gleam = "0.11"
 mozangle = {version = "0.3.1", features = ["egl"]}
 webrender = {path = "../webrender"}
 winapi = {version = "0.3", features = ["winerror", "d3d11", "dcomp"]}

gfx/wr/example-compositor/compositor/Cargo.toml

@@ -7,7 +7,7 @@ license = "MPL-2.0"
 
 [dependencies]
 webrender = { path = "../../webrender" }
-gleam = "0.10.0"
+gleam = "0.11.0"
 
 [target.'cfg(windows)'.dependencies]
 compositor-windows = { path = "../compositor-windows" }

gfx/wr/examples/Cargo.toml

@@ -61,7 +61,7 @@ debug = ["webrender/capture", "webrender/debugger", "webrender/profiler"]
 app_units = "0.7"
 env_logger = "0.5"
 euclid = "0.20"
-gleam = "0.10"
+gleam = "0.11"
 glutin = "0.21"
 rayon = "1"
 webrender = { path = "../webrender" }

gfx/wr/swgl/Cargo.toml

@@ -12,4 +12,4 @@ glsl-to-cxx = { path = "../glsl-to-cxx" }
 webrender_build = { path = "../webrender_build" }
 
 [dependencies]
-gleam = "0.10.0"
+gleam = "0.11.0"

gfx/wr/swgl/src/swgl_fns.rs

@@ -2210,4 +2210,44 @@ impl Gl for Context {
     ) {
         unimplemented!("This extension is GLES only");
     }
+
+    // GL_ANGLE_copy_texture_3d
+    fn copy_texture_3d_angle(
+        &self,
+        _source_id: GLuint,
+        _source_level: GLint,
+        _dest_target: GLenum,
+        _dest_id: GLuint,
+        _dest_level: GLint,
+        _internal_format: GLint,
+        _dest_type: GLenum,
+        _unpack_flip_y: GLboolean,
+        _unpack_premultiply_alpha: GLboolean,
+        _unpack_unmultiply_alpha: GLboolean,
+    ) {
+        unimplemented!("Not supported by SWGL");
+    }
+
+    fn copy_sub_texture_3d_angle(
+        &self,
+        _source_id: GLuint,
+        _source_level: GLint,
+        _dest_target: GLenum,
+        _dest_id: GLuint,
+        _dest_level: GLint,
+        _x_offset: GLint,
+        _y_offset: GLint,
+        _z_offset: GLint,
+        _x: GLint,
+        _y: GLint,
+        _z: GLint,
+        _width: GLsizei,
+        _height: GLsizei,
+        _depth: GLsizei,
+        _unpack_flip_y: GLboolean,
+        _unpack_premultiply_alpha: GLboolean,
+        _unpack_unmultiply_alpha: GLboolean,
+    ) {
+        unimplemented!("Not supported by SWGL");
+    }
 }

gfx/wr/webrender/Cargo.toml

@@ -32,7 +32,7 @@ cfg-if = "0.1.2"
 cstr = "0.1.2"
 euclid = { version = "0.20.0", features = ["serde"] }
 fxhash = "0.2.1"
-gleam = "0.10.0"
+gleam = "0.11.0"
 image_loader = { optional = true, version = "0.23", package = "image", default-features = false, features = ["png"] }
 lazy_static = "1"
 log = "0.4"

gfx/wr/wrench/Cargo.toml

@@ -12,7 +12,7 @@ bincode = "1.0"
 byteorder = "1.0"
 env_logger = { version = "0.5", optional = true }
 euclid = "0.20"
-gleam = "0.10"
+gleam = "0.11"
 glutin = "0.21"
 app_units = "0.7"
 clap = { version = "2", features = ["yaml"] }

third_party/rust/gleam/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"7fd2d6695ffe34ceef70faf02bd5df9d17d650951f038a84bcfe8c09d714a2be","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"1acb12040be43a3582d5897f11870b3ffdcd7ce0f4f32de158175bb6b33ec0b7","build.rs":"b6b30972ee2be2e151af0ca93b30ccc3c8bce2cfeef4217244d6b413b6bd0c9d","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/gl.rs":"89e61e0ecb0c8c1d3dbd8cdf3f26270d4cdf8bf6832c9b356ed5694620271967","src/gl_fns.rs":"517f195005a45f13fb9928a684c1e0c831136404ec7eeac1b5f0c0dbef1ac64a","src/gles_fns.rs":"bd46d068d41d4fd405a99e9b5a966a69fc186195da9fb3e9dcbd73f62f95f73a","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"77b1fd76468fff720bad31016688b805c6442ebf2d7c29123e10e4984aa61986"}
+{"files":{"COPYING":"ec82b96487e9e778ee610c7ab245162464782cfa1f555c2299333f8dbe5c036a","Cargo.toml":"7b245c63fdb36ae5e867bfdf9fb81fdcb8192851af5076bb5d9d2ba83eb2edd7","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"62065228e42caebca7e7d7db1204cbb867033de5982ca4009928915e4095f3a3","README.md":"1acb12040be43a3582d5897f11870b3ffdcd7ce0f4f32de158175bb6b33ec0b7","build.rs":"9a5ad7bf7ea760f64002aa4d9002298a8ec14981daff144756d3e4ac10b3de1d","rustfmt.toml":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","src/gl.rs":"354780a692bfe2d90c86f601aecb4d096f84d759b692dca13061002b4f8bb0b1","src/gl_fns.rs":"85f7464a0b270202ab9db43a82ed1d1fb5c7e39fdbd00677eaeee5447a5104c2","src/gles_fns.rs":"48a130ceea87c02ef45cffe79fa8c71a1f47024d03e96db744751ea335f782cb","src/lib.rs":"16610c19b45a3f26d56b379a3591aa2e4fc9477e7bd88f86b31c6ea32e834861"},"package":"d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"}

third_party/rust/gleam/Cargo.toml

@@ -12,7 +12,7 @@
 
 [package]
 name = "gleam"
-version = "0.10.0"
+version = "0.11.0"
 authors = ["The Servo Project Developers"]
 build = "build.rs"
 description = "Generated OpenGL bindings and wrapper for Servo."

third_party/rust/gleam/build.rs

@@ -60,6 +60,7 @@ fn main() {
         "GL_KHR_debug",
         "GL_KHR_blend_equation_advanced",
         "GL_KHR_blend_equation_advanced_coherent",
+        "GL_ANGLE_copy_texture_3d",
     ];
     let gles_reg = Registry::new(
         Api::Gles2,

third_party/rust/gleam/src/gl.rs

@@ -606,6 +606,42 @@ declare_gl_apis! {
         dest_target: GLenum, dest_id: GLuint, dest_level: GLint,
         x_offset: GLint, y_offset: GLint, x: GLint, y: GLint, width: GLsizei, height: GLsizei,
         unpack_flip_y: GLboolean, unpack_premultiply_alpha: GLboolean, unpack_unmultiply_alpha: GLboolean);
+
+    // GL_ANGLE_copy_texture_3d
+    fn copy_texture_3d_angle(
+        &self,
+        source_id: GLuint,
+        source_level: GLint,
+        dest_target: GLenum,
+        dest_id: GLuint,
+        dest_level: GLint,
+        internal_format: GLint,
+        dest_type: GLenum,
+        unpack_flip_y: GLboolean,
+        unpack_premultiply_alpha: GLboolean,
+        unpack_unmultiply_alpha: GLboolean,
+    );
+
+    fn copy_sub_texture_3d_angle(
+        &self,
+        source_id: GLuint,
+        source_level: GLint,
+        dest_target: GLenum,
+        dest_id: GLuint,
+        dest_level: GLint,
+        x_offset: GLint,
+        y_offset: GLint,
+        z_offset: GLint,
+        x: GLint,
+        y: GLint,
+        z: GLint,
+        width: GLsizei,
+        height: GLsizei,
+        depth: GLsizei,
+        unpack_flip_y: GLboolean,
+        unpack_premultiply_alpha: GLboolean,
+        unpack_unmultiply_alpha: GLboolean,
+    );
 }
 
 //#[deprecated(since = "0.6.11", note = "use ErrorReactingGl instead")]

third_party/rust/gleam/src/gl_fns.rs

@@ -2197,4 +2197,44 @@ impl Gl for GlFns {
     {
         unimplemented!("This extension is GLES only");
     }
+
+    // GL_ANGLE_copy_texture_3d
+    fn copy_texture_3d_angle(
+        &self,
+        _source_id: GLuint,
+        _source_level: GLint,
+        _dest_target: GLenum,
+        _dest_id: GLuint,
+        _dest_level: GLint,
+        _internal_format: GLint,
+        _dest_type: GLenum,
+        _unpack_flip_y: GLboolean,
+        _unpack_premultiply_alpha: GLboolean,
+        _unpack_unmultiply_alpha: GLboolean,
+    ) {
+        unimplemented!("This extension is ANGLE only");
+    }
+
+    fn copy_sub_texture_3d_angle(
+        &self,
+        _source_id: GLuint,
+        _source_level: GLint,
+        _dest_target: GLenum,
+        _dest_id: GLuint,
+        _dest_level: GLint,
+        _x_offset: GLint,
+        _y_offset: GLint,
+        _z_offset: GLint,
+        _x: GLint,
+        _y: GLint,
+        _z: GLint,
+        _width: GLsizei,
+        _height: GLsizei,
+        _depth: GLsizei,
+        _unpack_flip_y: GLboolean,
+        _unpack_premultiply_alpha: GLboolean,
+        _unpack_unmultiply_alpha: GLboolean,
+    ) {
+        unimplemented!("This extension is ANGLE only");
+    }
 }

third_party/rust/gleam/src/gles_fns.rs

@@ -2166,4 +2166,77 @@ impl Gl for GlesFns {
             );
         }
     }
+
+    // GL_ANGLE_copy_texture_3d
+    fn copy_texture_3d_angle(
+        &self,
+        source_id: GLuint,
+        source_level: GLint,
+        dest_target: GLenum,
+        dest_id: GLuint,
+        dest_level: GLint,
+        internal_format: GLint,
+        dest_type: GLenum,
+        unpack_flip_y: GLboolean,
+        unpack_premultiply_alpha: GLboolean,
+        unpack_unmultiply_alpha: GLboolean,
+    ) {
+        unsafe {
+            self.ffi_gl_.CopyTexture3DANGLE(
+                source_id,
+                source_level,
+                dest_target,
+                dest_id,
+                dest_level,
+                internal_format,
+                dest_type,
+                unpack_flip_y,
+                unpack_premultiply_alpha,
+                unpack_unmultiply_alpha,
+            );
+        }
+    }
+
+    fn copy_sub_texture_3d_angle(
+        &self,
+        source_id: GLuint,
+        source_level: GLint,
+        dest_target: GLenum,
+        dest_id: GLuint,
+        dest_level: GLint,
+        x_offset: GLint,
+        y_offset: GLint,
+        z_offset: GLint,
+        x: GLint,
+        y: GLint,
+        z: GLint,
+        width: GLsizei,
+        height: GLsizei,
+        depth: GLsizei,
+        unpack_flip_y: GLboolean,
+        unpack_premultiply_alpha: GLboolean,
+        unpack_unmultiply_alpha: GLboolean,
+    ) {
+        unsafe {
+            self.ffi_gl_.CopySubTexture3DANGLE(
+                source_id,
+                source_level,
+                dest_target,
+                dest_id,
+                dest_level,
+                x_offset,
+                y_offset,
+                z_offset,
+                x,
+                y,
+                z,
+                width,
+                height,
+                depth,
+                unpack_flip_y,
+                unpack_premultiply_alpha,
+                unpack_unmultiply_alpha,
+            );
+        }
+    }
 }