1 files changed, 174 insertions, 0 deletions
diff --git a/third_party/webrender/patches/0002-Bug-1646741-Update-gleam-to-0.12.-r-kvark.patch b/third_party/webrender/patches/0002-Bug-1646741-Update-gleam-to-0.12.-r-kvark.patch
new file mode 100644
index 00000000000..7bb98352203
--- /dev/null
+++ b/third_party/webrender/patches/0002-Bug-1646741-Update-gleam-to-0.12.-r-kvark.patch
@@ -0,0 +1,174 @@
+From 299c4db222eb9f0acd9623b66b8f3d0a8a8f77f2 Mon Sep 17 00:00:00 2001
+From: Jeff Muizelaar <jmuizelaar@mozilla.com>
+Date: Fri, 19 Jun 2020 04:10:02 +0000
+Subject: [PATCH 2/6] Bug 1646741 - Update gleam to 0.12. r=kvark
+
+For stride calculation and SSBOs
+
+Differential Revision: https://phabricator.services.mozilla.com/D80191
+
+[ghsync] From https://hg.mozilla.org/mozilla-central/rev/ef8485a16d099e24f4832178664c5a93a28396ec
+---
+ Cargo.lock                               | 16 ++++++++--------
+ direct-composition/Cargo.toml            |  2 +-
+ example-compositor/compositor/Cargo.toml |  2 +-
+ examples/Cargo.toml                      |  2 +-
+ swgl/Cargo.toml                          |  2 +-
+ webrender/Cargo.toml                     |  2 +-
+ wrench/Cargo.toml                        |  2 +-
+ 7 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index cf91162d5..3eb484f26 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -257,7 +257,7 @@ name = "compositor"
+ version = "0.1.0"
+ dependencies = [
+  "compositor-windows 0.1.0",
+- "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gleam 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "webrender 0.61.0",
+ ]
+ 
+@@ -435,7 +435,7 @@ name = "direct-composition"
+ version = "0.1.0"
+ dependencies = [
+  "euclid 0.20.10 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gleam 0.12.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)",
+@@ -617,7 +617,7 @@ dependencies = [
+ 
+ [[package]]
+ name = "gleam"
+-version = "0.11.0"
++version = "0.12.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)",
+@@ -1545,7 +1545,7 @@ name = "swgl"
+ version = "0.1.0"
+ dependencies = [
+  "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gleam 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gleam 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glsl-to-cxx 0.1.0",
+  "webrender_build 0.0.1",
+ ]
+@@ -1773,7 +1773,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.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gleam 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "glslopt 0.1.2 (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)",
+@@ -1808,7 +1808,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.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gleam 0.12.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",
+@@ -1938,7 +1938,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.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gleam 0.12.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)",
+@@ -2087,7 +2087,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.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9a13b5bb12ab457c15400b43cbba5971df5c1898b6a9c30cc8c52cb01baa112"
++"checksum gleam 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8d023b0b00c16960f0f82816f2f546dabe937e75b25c7d6ce09a63e6a52d71e"
+ "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 glslopt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f22b383fcf6f85c4a268af39a0758ec40970e5f9f8fe9809e4415d48409b8379"
+diff --git a/direct-composition/Cargo.toml b/direct-composition/Cargo.toml
+index d099402d8..3506aec02 100644
+--- a/direct-composition/Cargo.toml
++++ b/direct-composition/Cargo.toml
+@@ -7,7 +7,7 @@ edition = "2018"
+ 
+ [target.'cfg(windows)'.dependencies]
+ euclid = "0.20"
+-gleam = "0.11"
++gleam = "0.12"
+ mozangle = {version = "0.3.1", features = ["egl"]}
+ webrender = {path = "../webrender"}
+ winapi = {version = "0.3", features = ["winerror", "d3d11", "dcomp"]}
+diff --git a/example-compositor/compositor/Cargo.toml b/example-compositor/compositor/Cargo.toml
+index ce4d61928..d505e9ad2 100644
+--- a/example-compositor/compositor/Cargo.toml
++++ b/example-compositor/compositor/Cargo.toml
+@@ -7,7 +7,7 @@ license = "MPL-2.0"
+ 
+ [dependencies]
+ webrender = { path = "../../webrender" }
+-gleam = "0.11.0"
++gleam = "0.12.0"
+ 
+ [target.'cfg(windows)'.dependencies]
+ compositor-windows = { path = "../compositor-windows" }
+diff --git a/examples/Cargo.toml b/examples/Cargo.toml
+index 31c695f98..09e658ca2 100644
+--- a/examples/Cargo.toml
++++ b/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.11"
++gleam = "0.12"
+ glutin = "0.21"
+ rayon = "1"
+ webrender = { path = "../webrender" }
+diff --git a/swgl/Cargo.toml b/swgl/Cargo.toml
+index 3d57edbab..bc5a04b0a 100644
+--- a/swgl/Cargo.toml
++++ b/swgl/Cargo.toml
+@@ -12,4 +12,4 @@ glsl-to-cxx = { path = "../glsl-to-cxx" }
+ webrender_build = { path = "../webrender_build" }
+ 
+ [dependencies]
+-gleam = "0.11.0"
++gleam = "0.12.0"
+diff --git a/webrender/Cargo.toml b/webrender/Cargo.toml
+index f7679da57..2b0ab14fb 100644
+--- a/webrender/Cargo.toml
++++ b/webrender/Cargo.toml
+@@ -34,7 +34,7 @@ cfg-if = "0.1.2"
+ cstr = "0.1.2"
+ euclid = { version = "0.20.0", features = ["serde"] }
+ fxhash = "0.2.1"
+-gleam = "0.11.0"
++gleam = "0.12.0"
+ image_loader = { optional = true, version = "0.23", package = "image", default-features = false, features = ["png"] }
+ lazy_static = "1"
+ log = "0.4"
+diff --git a/wrench/Cargo.toml b/wrench/Cargo.toml
+index 988e2537a..4ba95e4c4 100644
+--- a/wrench/Cargo.toml
++++ b/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.11"
++gleam = "0.12"
+ glutin = "0.21"
+ app_units = "0.7"
+ clap = { version = "2", features = ["yaml"] }
+-- 
+2.39.2
+