Skip to content

Commit

Permalink
Bug 1729751 - Update wgpu and ron 3rd parties r=jimb
Browse files Browse the repository at this point in the history
Brings a few important fixes:
  - better WGSL support
  - Solaris build (1729751)
  - crash in "_MTLCommandEncoder dealloc" (1729648)

Differential Revision: https://phabricator.services.mozilla.com/D125103
  • Loading branch information
kvark committed Sep 10, 2021
1 parent c2b9557 commit 313f426
Show file tree
Hide file tree
Showing 204 changed files with 20,497 additions and 3,869 deletions.
4 changes: 2 additions & 2 deletions .cargo/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ rev = "302c995f91f44cf26e77dc4758ad56c3ff0153ad"
[source."https://github.com/gfx-rs/wgpu"]
git = "https://github.com/gfx-rs/wgpu"
replace-with = "vendored-sources"
rev = "d23288e"
rev = "37288a6"

[source."https://github.com/gfx-rs/naga"]
git = "https://github.com/gfx-rs/naga"
replace-with = "vendored-sources"
rev = "93db57c"
rev = "e226cf3"

[source."https://github.com/bytecodealliance/wasmtime"]
git = "https://github.com/bytecodealliance/wasmtime"
Expand Down
46 changes: 35 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions gfx/wgpu_bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ default = []
[dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "d23288e"
rev = "37288a6"
features = ["replay", "trace", "serial-pass"]

[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "d23288e"
rev = "37288a6"

[dependencies.wgh]
package = "wgpu-hal"
git = "https://github.com/gfx-rs/wgpu"
rev = "d23288e"
rev = "37288a6"

[dependencies]
bincode = "1"
Expand Down
4 changes: 2 additions & 2 deletions gfx/wgpu_bindings/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -454,12 +454,12 @@ impl GlobalExt for Global {
error_buf.init(err);
}
}
CommandEncoderAction::ClearImage {
CommandEncoderAction::ClearTexture {
dst,
ref subresource_range,
} => {
if let Err(err) =
self.command_encoder_clear_image::<A>(self_id, dst, subresource_range)
self.command_encoder_clear_texture::<A>(self_id, dst, subresource_range)
{
error_buf.init(err);
}
Expand Down
1 change: 1 addition & 0 deletions third_party/rust/base64-0.12.3/.cargo-checksum.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"files":{"Cargo.lock":"877ba5876c45467b7b0559c7e06b204d770a0506d1d0245177e05e1ce7e55d9e","Cargo.toml":"ab65d9df0e65063832cd59194f70329993df5bffd0d7c8d6c76a3a953ffa8979","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0dd882e53de11566d50f8e8e2d5a651bcf3fabee4987d70f306233cf39094ba7","README.md":"2810098d290f3df719e6f41ffca38bb954d0fe62d4e56905a9a2436c4784bebf","RELEASE-NOTES.md":"56eb440ed5257c679a400bbecfad7753cf052a685b66a3875fc8102ef9b2e652","benches/benchmarks.rs":"4eedafc56a6e6477731af2d04c6b673bb320a46d7f02f8329ea3a4d6b55c5f25","examples/make_tables.rs":"d9bb662440167f2c6995f64949d039b25431624122be189fa240e65fad93fdaa","icon_CLion.svg":"cffa044ba75cb998ee3306991dc4a3755ec2f39ab95ddd4b74bc21988389020f","src/chunked_encoder.rs":"fba5ea5f1204b9bf11291ec3483bcb23d330101eb2f6635e33cd63e4de13b653","src/decode.rs":"7bbbade0e9e2f8a1937afee8a62273f6c8c878ea2574cdc06c33b9672a7f3b8d","src/display.rs":"55f9cd05ba037b77689e2558fa174055fad5273959d1edce3a2289f94244fd5d","src/encode.rs":"390f875ae06647f732a06e0003aa9dfffb8a9c3a6b1acc20911cfedebc380b4b","src/lib.rs":"0e1df019eb709ecd1965dad5a591e8d39fe0050b143bddf9aa1f236deda78f37","src/read/decoder.rs":"9a7b65e165f7aed6b007bf7436ac9ba9b03d3b03e9d5a1e16691874e21509ced","src/read/decoder_tests.rs":"aacb7624c33ed6b90e068ff9af6095c839b4088060b4c406c08dce25ce837f6d","src/read/mod.rs":"e0b714eda02d16b1ffa6f78fd09b2f963e01c881b1f7c17b39db4e904be5e746","src/tables.rs":"73ce100fd3f4917ec1e8d9277ff0b956cc2636b33145f101a7cf1a5a8b7bacc1","src/tests.rs":"202ddced9cf52205182c6202e583c4c4f929b9d225fd9d1ebdbfd389cb2df0ba","src/write/encoder.rs":"f99b967f4347c44af8d0b8cb7ad29228a1b168a13738d7298dbe07b7411de30a","src/write/encoder_tests.rs":"7192e321a1c61afa0de5ecb3c07757777ea4bc2844789cdb93852467977d5969","src/write/mod.rs":"124b223f3effcb1d85671a4173a635cdfae480341b032217c77876647344176b","tests/decode.rs":"2b63c9e7f9dd48153e77206882684d3f99288bcfa2addda71b255e5d966c8b00","tests/encode.rs":"5efb6904c36c6f899a05078e5c9be756fc58af1ee9940edfa8dea1ee53675364","tests/helpers.rs":"a76015e4a4e8f98213bdbaa592cd9574ccdc95a28e1b1f835a2753e09fa6037f","tests/tests.rs":"05753e5f1d4a6c75015a5342f9b5dc3073c00bdfe0a829a962f8723321c75549"},"package":"3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"}
Loading

0 comments on commit 313f426

Please sign in to comment.