Bug 1858683 - Update wgpu to revision 858d7d590ef9ebfe1b91f6f0925aa…

…cde15cce714. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler

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

.cargo/config.in

@@ -30,14 +30,14 @@ git = "https://github.com/gfx-rs/metal-rs/"
 rev = "d24f1a4"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/naga?rev=6668d0694cc51ee66c71c2ca3a1ab1081956299b"]
+[source."git+https://github.com/gfx-rs/naga?rev=33b75a27d93c6574b11b4dd4492b85b5783d6c52"]
 git = "https://github.com/gfx-rs/naga"
-rev = "6668d0694cc51ee66c71c2ca3a1ab1081956299b"
+rev = "33b75a27d93c6574b11b4dd4492b85b5783d6c52"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=1495e159faf721cbf87a0634157682f454a963fb"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=858d7d590ef9ebfe1b91f6f0925aacde15cce714"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d"]

gfx/wgpu_bindings/Cargo.toml

@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 #Note: "replay" shouldn't ideally be needed,
 # but it allows us to serialize everything across IPC.
 features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
@@ -27,32 +27,32 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 features = ["metal"]
 
 # We want the wgpu-core Direct3D backends on Windows.
 [target.'cfg(windows)'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 features = ["dx11", "dx12"]
 
 # We want the wgpu-core Vulkan backend on Linux and Windows.
 [target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "1495e159faf721cbf87a0634157682f454a963fb"
+rev = "858d7d590ef9ebfe1b91f6f0925aacde15cce714"
 
 [target.'cfg(windows)'.dependencies]
 d3d12 = "0.7.0"

gfx/wgpu_bindings/moz.yaml

@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: commit 1495e159faf721cbf87a0634157682f454a963fb
+  release: commit 858d7d590ef9ebfe1b91f6f0925aacde15cce714
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: 1495e159faf721cbf87a0634157682f454a963fb
+  revision: 858d7d590ef9ebfe1b91f6f0925aacde15cce714
 
   license: ['MIT', 'Apache-2.0']
 

gfx/wgpu_bindings/src/server.rs

@@ -87,6 +87,7 @@ pub extern "C" fn wgpu_server_new(
         factory,
         wgt::InstanceDescriptor {
             backends,
+            flags: wgt::InstanceFlags::from_build_config().with_env(),
             dx12_shader_compiler: wgt::Dx12Compiler::Fxc,
             gles_minor_version: wgt::Gles3MinorVersion::Automatic,
         },

supply-chain/audits.toml

@@ -2347,6 +2347,11 @@ who = "Teodor Tanasoaia <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.12.0@git:b99d58ea435090e561377949f428bce2c18451bb -> 0.12.0@git:76003dc0035d53a474d366dcdf49d2e4d12e921f"
 
+[[audits.naga]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.0@git:6668d0694cc51ee66c71c2ca3a1ab1081956299b -> 0.13.0@git:33b75a27d93c6574b11b4dd4492b85b5783d6c52"
+
 [[audits.naga]]
 who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4086,6 +4091,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.17.0@git:09b010b26af6876ce84991576a168a572172f08d -> 0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
 
+[[audits.wgpu-core]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0@git:1495e159faf721cbf87a0634157682f454a963fb -> 0.17.0@git:858d7d590ef9ebfe1b91f6f0925aacde15cce714"
+
 [[audits.wgpu-core]]
 who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4214,6 +4224,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.17.0@git:09b010b26af6876ce84991576a168a572172f08d -> 0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
 
+[[audits.wgpu-hal]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0@git:1495e159faf721cbf87a0634157682f454a963fb -> 0.17.0@git:858d7d590ef9ebfe1b91f6f0925aacde15cce714"
+
 [[audits.wgpu-hal]]
 who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"
@@ -4342,6 +4357,11 @@ who = "Erich Gubler <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.17.0@git:09b010b26af6876ce84991576a168a572172f08d -> 0.17.0@git:7c6b85756237f77bfe8d6231dfc7a1412ff662b6"
 
+[[audits.wgpu-types]]
+who = "Nicolas Silva <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.17.0@git:1495e159faf721cbf87a0634157682f454a963fb -> 0.17.0@git:858d7d590ef9ebfe1b91f6f0925aacde15cce714"
+
 [[audits.wgpu-types]]
 who = "Nicolas Silva <[email protected]>"
 criteria = "safe-to-deploy"

third_party/rust/khronos-egl/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"72e6058dddb110c7e70fb26e2f370b9958a5e03efdea048f62fb338807fbe7de","Cargo.lock":"99216196a89fb759029d053bdc1c32b4423295793a0f4dc5f4218626e7a29c21","Cargo.toml":"efbaf25a93c000f823abe977e272de2d43a35b1cfcbf0fc03d2df00631251871","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"613a096d04cd5ae2ab67acd09298ea30c7d7e89eabcc817249ea9b88f88470ae","build.rs":"54e6dd50d7b9f189b687b5f39b58131090004130a5d054614d3304a3912af96a","examples/load-minimal.rs":"a9bd9a34e2a30d189f878c5c2c1111e76c2fda70b10c284cf731c8cbfc921891","examples/wayland-dynamic.rs":"a7b32ca80fd124f4cf8cb7e6f2de6b0ca277f6619a5376b12e904c2ec1cc5a06","examples/wayland-static.rs":"b3f53b9ae1e5e639c9ee15485d16bd718cfd40f70635166318a224e337cee577","shell-wayland.nix":"ee9753492f0a7466b59ec23dff1c6d5c7a8178ec3dc1dd488964f1cb4859c44b","shell.nix":"1089d919bcbdf4afcd6f4403cfbe08a59253215398fdde34e6a4c62f70129f47","src/lib.rs":"7287d03b23a710f47f8cdaf2a82ed8a1c40af10737fb5a972a5fdf0600ef0b47"},"package":"8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3"}
+{"files":{"CHANGELOG.md":"44103a0f03beeb00ca47b2e5d46d2a99530535aa663aac23245b92c5cdc250fb","Cargo.lock":"10ce53d636ff39ba8af984a3b5ede1a82be1d8e2598596f5da4c04beceb00c03","Cargo.toml":"d22f46ec07e8a0a41e8c5cb14f38ad3fea398593c76fce9fb51c5280c12a0832","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"613a096d04cd5ae2ab67acd09298ea30c7d7e89eabcc817249ea9b88f88470ae","build.rs":"d932445d4ed5c9545f2ae99417c97090e842b0ef14d217cdb4cea6b75174b4fd","examples/load-minimal.rs":"fbb649443d9180591bdc8214234312cf8624f972d135106686c39cbf5937915c","examples/wayland-dynamic.rs":"84430463f77cc996878aee1c4851c1e5cfa94438d46872dcee8808e7c7a8a028","examples/wayland-static.rs":"d0bd87d2341c0aaeeddad8ebd21b7f80894504a0f957f02ddb1d8e613a69a9b8","shell-wayland.nix":"ee9753492f0a7466b59ec23dff1c6d5c7a8178ec3dc1dd488964f1cb4859c44b","shell.nix":"1089d919bcbdf4afcd6f4403cfbe08a59253215398fdde34e6a4c62f70129f47","src/lib.rs":"e081b066e99ee1e028d265c5e873fae605a0ad56bb039f0abf36b1e6645dfafe"},"package":"6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76"}

third_party/rust/khronos-egl/CHANGELOG.md

@@ -5,7 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unpublished]
+## [6.0.0]
+### Changed
+- `copy_buffers` is now unsafe.
+- `get_display` is now unsafe.
+- `get_platform_display` is now unsafe.
+- `create_platform_window_surface` is now unsafe.
+- `create_platform_pixmap_surface` is now unsafe.
+### Fixed
+- Fix `choose_config` & `get_config` undefined behavior when the input `configs`
+  vector is empty. (Fixes [#21](https://github.com/timothee-haudebourg/khronos-egl/issues/21)).
+- Fix Windows build (Fixes [#23](https://github.com/timothee-haudebourg/khronos-egl/pull/23)).
+
+## [5.0.0]
+### Changed
+- Upgrade dependency `libloading`: ^0.7 -> ^0.8.
+
 ## [4.1.0]
 ### Changed
 - `load_required` and `load` now trying to load `libEGL.so.1` or `libEGL.so`.

third_party/rust/khronos-egl/Cargo.toml

@@ -3,22 +3,30 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# 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)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
+edition = "2021"
 name = "khronos-egl"
-version = "4.1.0"
-authors = ["Timothée Haudebourg <[email protected]>", "Sean Kerr <[email protected]>"]
+version = "6.0.0"
+authors = [
+    "Timothée Haudebourg <[email protected]>",
+    "Sean Kerr <[email protected]>",
+]
 build = "build.rs"
 description = "Rust bindings for EGL"
 documentation = "https://docs.rs/khronos-egl"
 readme = "README.md"
-keywords = ["egl", "gl", "khronos", "opengl"]
+keywords = [
+    "egl",
+    "gl",
+    "khronos",
+    "opengl",
+]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/timothee-haudebourg/khronos-egl"
 
@@ -32,13 +40,18 @@ required-features = ["dynamic"]
 
 [[example]]
 name = "load-minimal"
-required-features = ["dynamic", "1_4"]
+required-features = [
+    "dynamic",
+    "1_4",
+]
+
 [dependencies.libc]
 version = "^0.2"
 
 [dependencies.libloading]
-version = "^0.7"
+version = "^0.8"
 optional = true
+
 [dev-dependencies.gl]
 version = "^0.14"
 
@@ -51,6 +64,7 @@ version = "^0.28"
 [dev-dependencies.wayland-protocols]
 version = "^0.28"
 features = ["client"]
+
 [build-dependencies.pkg-config]
 version = "^0.3"
 optional = true