diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in index 08680c0246cc..c6f21070d213 100644 --- a/.cargo/config.toml.in +++ b/.cargo/config.toml.in @@ -40,9 +40,9 @@ git = "https://github.com/franziskuskiefer/cose-rust" rev = "43c22248d136c8b38fe42ea709d08da6355cf04b" replace-with = "vendored-sources" -[source."git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680"] +[source."git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc"] git = "https://github.com/gfx-rs/wgpu" -rev = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" replace-with = "vendored-sources" [source."git+https://github.com/glandium/rust-objc?rev=4de89f5aa9851ceca4d40e7ac1e2759410c04324"] diff --git a/Cargo.lock b/Cargo.lock index d43588ba5c09..a48fdc89fd92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4654,7 +4654,7 @@ checksum = "a2983372caf4480544083767bf2d27defafe32af49ab4df3a0b7fc90793a3664" [[package]] name = "naga" version = "25.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680#85001b2436f686451d6d783225311c06b60e6680" +source = "git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc#88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" dependencies = [ "arrayvec", "bit-set", @@ -7611,7 +7611,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "25.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680#85001b2436f686451d6d783225311c06b60e6680" +source = "git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc#88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" dependencies = [ "arrayvec", "bit-set", @@ -7641,7 +7641,7 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" version = "25.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680#85001b2436f686451d6d783225311c06b60e6680" +source = "git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc#88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" dependencies = [ "wgpu-hal", ] @@ -7649,7 +7649,7 @@ dependencies = [ [[package]] name = "wgpu-core-deps-windows-linux-android" version = "25.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680#85001b2436f686451d6d783225311c06b60e6680" +source = "git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc#88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" dependencies = [ "wgpu-hal", ] @@ -7657,7 +7657,7 @@ dependencies = [ [[package]] name = "wgpu-hal" version = "25.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680#85001b2436f686451d6d783225311c06b60e6680" +source = "git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc#88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" dependencies = [ "android_system_properties", "arrayvec", @@ -7693,7 +7693,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "25.0.0" -source = "git+https://github.com/gfx-rs/wgpu?rev=85001b2436f686451d6d783225311c06b60e6680#85001b2436f686451d6d783225311c06b60e6680" +source = "git+https://github.com/gfx-rs/wgpu?rev=88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc#88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" dependencies = [ "bitflags 2.9.0", "bytemuck", diff --git a/gfx/wgpu_bindings/Cargo.toml b/gfx/wgpu_bindings/Cargo.toml index 4d9a3876df3d..3fbc37c590d2 100644 --- a/gfx/wgpu_bindings/Cargo.toml +++ b/gfx/wgpu_bindings/Cargo.toml @@ -17,7 +17,7 @@ default = [] [dependencies.wgc] package = "wgpu-core" git = "https://github.com/gfx-rs/wgpu" -rev = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" # TODO: remove the replay feature on the next update containing https://github.com/gfx-rs/wgpu/pull/5182 features = [ "serde", @@ -33,32 +33,32 @@ features = [ [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc] package = "wgpu-core" git = "https://github.com/gfx-rs/wgpu" -rev = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" 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 = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" features = ["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 = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" features = ["vulkan"] [dependencies.wgt] package = "wgpu-types" git = "https://github.com/gfx-rs/wgpu" -rev = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" [dependencies.wgh] package = "wgpu-hal" git = "https://github.com/gfx-rs/wgpu" -rev = "85001b2436f686451d6d783225311c06b60e6680" +rev = "88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" features = ["device_lost_panic", "internal_error_panic"] [target.'cfg(windows)'.dependencies] diff --git a/gfx/wgpu_bindings/moz.yaml b/gfx/wgpu_bindings/moz.yaml index 98604c609c16..4eeeed145ca3 100644 --- a/gfx/wgpu_bindings/moz.yaml +++ b/gfx/wgpu_bindings/moz.yaml @@ -8,8 +8,8 @@ origin: name: wgpu description: A cross-platform pure-Rust graphics API, modeled on the WebGPU standard url: https://github.com/gfx-rs/wgpu - release: 85001b2436f686451d6d783225311c06b60e6680 (Tue May 13 22:52:49 2025 -0400) - revision: 85001b2436f686451d6d783225311c06b60e6680 + release: 88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc (2025-07-08T13:16:29Z). + revision: 88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc license: ['MIT', 'Apache-2.0'] updatebot: diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml index 95f3a4bb7780..9cc08a435d5f 100644 --- a/supply-chain/audits.toml +++ b/supply-chain/audits.toml @@ -3806,11 +3806,11 @@ delta = "24.0.0 -> 25.0.0" [[audits.naga]] who = [ "Teodor Tanasoaia ", - "Erich Gubler ", "Jim Blandy ", + "Erich Gubler ", ] criteria = "safe-to-deploy" -delta = "25.0.0 -> 25.0.0@git:85001b2436f686451d6d783225311c06b60e6680" +delta = "25.0.0 -> 25.0.0@git:88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" importable = false [[audits.net2]] @@ -6106,11 +6106,11 @@ delta = "24.0.0 -> 25.0.0" [[audits.wgpu-core]] who = [ "Teodor Tanasoaia ", - "Erich Gubler ", "Jim Blandy ", + "Erich Gubler ", ] criteria = "safe-to-deploy" -delta = "25.0.0 -> 25.0.0@git:85001b2436f686451d6d783225311c06b60e6680" +delta = "25.0.0 -> 25.0.0@git:88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" importable = false [[audits.wgpu-core-deps-apple]] @@ -6121,11 +6121,11 @@ version = "25.0.0" [[audits.wgpu-core-deps-apple]] who = [ "Teodor Tanasoaia ", - "Erich Gubler ", "Jim Blandy ", + "Erich Gubler ", ] criteria = "safe-to-deploy" -delta = "25.0.0 -> 25.0.0@git:85001b2436f686451d6d783225311c06b60e6680" +delta = "25.0.0 -> 25.0.0@git:88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" importable = false [[audits.wgpu-core-deps-windows-linux-android]] @@ -6136,11 +6136,11 @@ version = "25.0.0" [[audits.wgpu-core-deps-windows-linux-android]] who = [ "Teodor Tanasoaia ", - "Erich Gubler ", "Jim Blandy ", + "Erich Gubler ", ] criteria = "safe-to-deploy" -delta = "25.0.0 -> 25.0.0@git:85001b2436f686451d6d783225311c06b60e6680" +delta = "25.0.0 -> 25.0.0@git:88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" importable = false [[audits.wgpu-hal]] @@ -6229,11 +6229,11 @@ delta = "24.0.0 -> 25.0.0" [[audits.wgpu-hal]] who = [ "Teodor Tanasoaia ", - "Erich Gubler ", "Jim Blandy ", + "Erich Gubler ", ] criteria = "safe-to-deploy" -delta = "25.0.0 -> 25.0.0@git:85001b2436f686451d6d783225311c06b60e6680" +delta = "25.0.0 -> 25.0.0@git:88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" importable = false [[audits.wgpu-types]] @@ -6317,11 +6317,11 @@ delta = "24.0.0 -> 25.0.0" [[audits.wgpu-types]] who = [ "Teodor Tanasoaia ", - "Erich Gubler ", "Jim Blandy ", + "Erich Gubler ", ] criteria = "safe-to-deploy" -delta = "25.0.0 -> 25.0.0@git:85001b2436f686451d6d783225311c06b60e6680" +delta = "25.0.0 -> 25.0.0@git:88862f1fa3fd0f0c1010e9fc999dcfe47b5ae8fc" importable = false [[audits.whatsys]] diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 185bba8eb7fc..4c2169d19923 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -927,36 +927,12 @@ start = "2020-01-14" end = "2025-07-30" notes = "I am an author of this crate" -[[audits.bytecode-alliance.wildcard-audits.wasm-encoder]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -user-id = 73222 # wasmtime-publish -start = "2023-01-01" -end = "2025-05-08" -notes = """ -The Bytecode Alliance uses the `wasmtime-publish` crates.io account to automate -publication of this crate from CI. This repository requires all PRs are reviewed -by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself. -""" - [[audits.bytecode-alliance.wildcard-audits.wasmparser]] who = "Alex Crichton " criteria = "safe-to-deploy" user-id = 73222 # wasmtime-publish start = "2023-01-01" -end = "2025-05-08" -notes = """ -The Bytecode Alliance uses the `wasmtime-publish` crates.io account to automate -publication of this crate from CI. This repository requires all PRs are reviewed -by a Bytecode Alliance maintainer and it owned by the Bytecode Alliance itself. -""" - -[[audits.bytecode-alliance.wildcard-audits.wast]] -who = "Alex Crichton " -criteria = "safe-to-deploy" -user-id = 73222 # wasmtime-publish -start = "2023-01-01" -end = "2025-05-08" +end = "2026-06-03" notes = """ The Bytecode Alliance uses the `wasmtime-publish` crates.io account to automate publication of this crate from CI. This repository requires all PRs are reviewed @@ -968,7 +944,7 @@ who = "Alex Crichton " criteria = "safe-to-deploy" user-id = 73222 # wasmtime-publish start = "2023-01-01" -end = "2025-05-08" +end = "2026-06-03" notes = """ The Bytecode Alliance uses the `wasmtime-publish` crates.io account to automate publication of this crate from CI. This repository requires all PRs are reviewed diff --git a/third_party/rust/wgpu-hal/.cargo-checksum.json b/third_party/rust/wgpu-hal/.cargo-checksum.json index 8faf255e6ef1..f42c872507f5 100644 --- a/third_party/rust/wgpu-hal/.cargo-checksum.json +++ b/third_party/rust/wgpu-hal/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"c772a9473340c79630a3085076089b2e131bed5c531a6e700f24d7db15153b3d","LICENSE.APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE.MIT":"c7fea58d1cfe49634cd92e54fc10a9d871f4b275321a4cd8c09e449122caaeb4","README.md":"cf9e84804a635e4a8a9fefc596be9da6bf7354dde0d105e27d56a12cb20dd8e3","build.rs":"40c99bddda32846afd639d84b9a160ddab338092560b5cb3402112ff37ab4fba","examples/halmark/main.rs":"f42ceef4ee26c1e2b5b917e697ae662099550fece8bb715b2076a55413662c6c","examples/halmark/shader.wgsl":"26c256ec36d6f0e9a1647431ca772766bee4382d64eaa718ba7b488dcfb6bcca","examples/raw-gles.em.html":"70fbe68394a1a4522192de1dcfaf7d399f60d7bdf5de70b708f9bb0417427546","examples/raw-gles.rs":"f41b15e898da0047d33c7bed0dd311ca6fade507ba453c238a7babf789480b6c","examples/ray-traced-triangle/main.rs":"ecbd4625050f1be3d61af83f4effffa11b8baaef127ec17a2d3ca0465cb7d967","examples/ray-traced-triangle/shader.wgsl":"cc10caf92746724a71f6dd0dbc3a71e57b37c7d1d83278556805a535c0728a9d","src/auxil/dxgi/conv.rs":"f451fb0c416a637f11542e9b166a48800be50c48925779b06d40a9bc87958d97","src/auxil/dxgi/exception.rs":"ccf59e9286aa8cceb96155de8e89153676dbce0d914646f502beb5f3e32c4246","src/auxil/dxgi/factory.rs":"1d8cfeb733e34b97d5b879705fc5621ab7b9be578aebb3c3ddadea992effb566","src/auxil/dxgi/mod.rs":"e6c5cc3b73bb97742135d6f35308c42f0822304764978fb8dabb0e848863352a","src/auxil/dxgi/name.rs":"ff942da0da1a497ee4d2be21604f7ba9fae963588105b3d1f63aae1a0c536e82","src/auxil/dxgi/result.rs":"a3b52fd87e512bb94df79c8cadf89a1fbcf7ab0a3a8c7fa1280c2e54cb75d96e","src/auxil/dxgi/time.rs":"b6911800be3873cbe277b2534b3839c6f005f3d9a09341aace4752e207d584a2","src/auxil/mod.rs":"540b9250d9f0e0af709245ce1e284eaca15b27d47550b0ebba2a512da1666c48","src/auxil/renderdoc.rs":"e687710ea0c9e88c9be0e2acd39d136635b835ffb941886b875811b3ec945080","src/dx12/adapter.rs":"33ab5352d9fda9f3d666276b8d4b9d19a2a3e00864e8aad3e928bf7b83af23f1","src/dx12/command.rs":"f11a50b9ada035ed27affcb0e127c63bc62ba8bfae47a9357251b263e1e7f872","src/dx12/conv.rs":"fa0b9936f391662390aa453c169b26aaf65ed3c7a00087c0f8a6b99de22614e7","src/dx12/descriptor.rs":"e3371d7539c44ffc4c7b958b6d948855200bb3c4e7da9577835cc0bca695807b","src/dx12/device.rs":"46115d2eae84934603d0aa61efe924ab2f95eae1432aa98d1d02d48eb37b7e93","src/dx12/instance.rs":"f2ef183443210f3bf1a95d5e750f316042e8b1929e59c8c9145351447ac9e922","src/dx12/mod.rs":"d9a68723214481fd5f02581efd71035d3ff929038168b0cf3cc8647e27d2b06e","src/dx12/sampler.rs":"64464c32452ee63ac49014a03ca3be894ab9b74e11dc853567b5da5f846faae6","src/dx12/shader_compilation.rs":"19daac0f8a1800417ee0e1e1f46bbb4f49b07954468b1abe0182c551679c9d99","src/dx12/suballocation.rs":"85e9077cd293730e4837888b24f348a1e44dde7af7444e8547a401f5f8fdf4a8","src/dx12/types.rs":"3fc7619fc09303eb3c936d4ded6889f94ce9e8b9aa62742ce900baa1b1e1cca7","src/dx12/view.rs":"79b3f7331d9795e60f9b53023cbf0df46c3a05b1e8bd5c7bcca8acdd235b124f","src/dynamic/adapter.rs":"e93f7d082a3950c9e8ccff8a631d251c7598b4b25dda9fe6347dadfa3ba07829","src/dynamic/command.rs":"9635dea15d8a885011d2b8b6b9cc5ffe2126cc3f141f47f7aaf46e1f201abea9","src/dynamic/device.rs":"f00305d56cac0636d4cb86cc44ee69c291bfb3d5f6d5e8d745adce9a28a6a1d5","src/dynamic/instance.rs":"7b515c201e1ca24f24439544dbfa1d19ea1412a4f89bd803e009aed13b021e55","src/dynamic/mod.rs":"b02a3c11b22c896cf66ef206f5d4bb4e24988ecadc29972c572baf347f54aa04","src/dynamic/queue.rs":"d76abb4797e90253386d24584f186dbe1909e772560156b2e891fa043cfefbdc","src/dynamic/surface.rs":"4328c2fe86931f50aa00ac3d6982d0879b774eebf7a507903d1b1898c891fb4d","src/gles/adapter.rs":"6756967585998be1ad772cea1fd1e0bbc644e3c2cb8bd97d2d0b9e383c8b2dc3","src/gles/command.rs":"9d8c10e75c9f289050e49d10a16b0071f022e8fa12ebf112190a6cd511d310ff","src/gles/conv.rs":"7f885dd2bc72641d22f8f2e688ebdd857663bfe315f1b5364ea302f99a05adbf","src/gles/device.rs":"a1e66b2007cedd2d7f28c8f1589757588e143e621e2e52b1813de65482c61150","src/gles/egl.rs":"a47cc262bfe590ecdf4e02e60106231900c26d18f64ad071326d77cffc718ead","src/gles/emscripten.rs":"316d2bb6f2a4bb126dbe68a223f7393399080d116b61c39504454acdf4f9cfaf","src/gles/fence.rs":"083cd49747aba6272002aba0b0c37e5768cdbc2a1b8bacd1a244ee905d3f7b0f","src/gles/mod.rs":"1e68ff6ec48c14a8bb494ee54cf504e7119761d3d9881ce1caef3f9aed10e584","src/gles/queue.rs":"019fe739a478bc02700d0154eac13fbabc8b8c60983ed2ebd56d67695e82bd50","src/gles/shaders/clear.frag":"9133ed8ed97d3641fbb6b5f5ea894a3554c629ccc1b80a5fc9221d7293aa1954","src/gles/shaders/clear.vert":"a543768725f4121ff2e9e1fb5b00644931e9d6f2f946c0ef01968afb5a135abd","src/gles/shaders/srgb_present.frag":"dd9a43c339a2fa4ccf7f6a1854c6f400cabf271a7d5e9230768e9f39d47f3ff5","src/gles/shaders/srgb_present.vert":"6e85d489403d80b81cc94790730bb53b309dfc5eeede8f1ea3412a660f31d357","src/gles/web.rs":"cb5940bf7b2381811675011b640040274f407a7d1908d0f82c813d6a9d3b00f7","src/gles/wgl.rs":"bff33c7ce78c5618b2d656398c2d13d3da980b9ce89c77f774adf9f6132563ef","src/lib.rs":"044cd49d4b48c5bd99c5f8245d7c00c746e76bce8ac6988fabcca8e9db099dc0","src/metal/adapter.rs":"f879d50a69f3d1552280dc44e25fc025ad13ae8d029d0783ed8a222685ad90d6","src/metal/command.rs":"1ec1a9e0e1ccf298c2c416b96e60827173e6584c9061b8dd582b7789545ce60a","src/metal/conv.rs":"85e8168be334ba24d109575a0a7e91b2ad3459403173e99e5cdd5d977cc5c18f","src/metal/device.rs":"52e8d128c7240b9efd99398456225d22ffea51137563d07af9de171b11f2480c","src/metal/layer_observer.rs":"8370a6e443d01739b951b8538ee719a03b69fc0cbac92c748db418fbcc8837b5","src/metal/mod.rs":"f957e28fc01a638ddad25b3fc7c14507f24923b6becaeae3e03f5caff7b58eb2","src/metal/surface.rs":"0855d3f26b3570c1f030cd50e818faac7918cd4a3c68584319c7edf07279788b","src/metal/time.rs":"c32d69f30e846dfcc0e39e01097fb80df63b2bebb6586143bb62494999850246","src/noop/buffer.rs":"89a938411204b33082200a1306fe589587de15142392d7ec591676512e4cfeb2","src/noop/command.rs":"3de99a1a260cfea2e6ca2e76797c1923cc26b069b08362c38798ce27cdc75543","src/noop/mod.rs":"3167878f073b3865092d7ad0ec944162bc627b7d6d5e0a7931d46f1a47c3918c","src/vulkan/adapter.rs":"538a7e69ab9bcf3fb402e068aba2b24b5852f9c5b864d242061788527cd9951d","src/vulkan/command.rs":"e058758398d4ec6fda1d0274d99b92ae541f4263ee804bcb1c42ca96f8610ac0","src/vulkan/conv.rs":"6727c1fa35dd6368850301426948fd536a305c65f257a0ed59b62ca6bbda9ade","src/vulkan/device.rs":"de7764201a624c39c7dbed4663ec49525fe08af3d00a38988e4f399e088dd029","src/vulkan/drm.rs":"b40575f188b2668e60c96ad62970b993930fd25c668a402b17086ed2f1b76b4e","src/vulkan/instance.rs":"d7e81c1bf92c765dac432205d9932c39d4f1418be12882d34f2f8e63b0b574e4","src/vulkan/mod.rs":"a35b8751f9422ecbe8162d73e045dcc4732e16613e9a1c5c216d097a6c949243","src/vulkan/sampler.rs":"f65729d6df5cce681b7756b3e48074017f0c7f42da69ca55e26cc723cd14ad59"},"package":null} \ No newline at end of file +{"files":{"Cargo.toml":"c772a9473340c79630a3085076089b2e131bed5c531a6e700f24d7db15153b3d","LICENSE.APACHE":"a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9","LICENSE.MIT":"c7fea58d1cfe49634cd92e54fc10a9d871f4b275321a4cd8c09e449122caaeb4","README.md":"cf9e84804a635e4a8a9fefc596be9da6bf7354dde0d105e27d56a12cb20dd8e3","build.rs":"40c99bddda32846afd639d84b9a160ddab338092560b5cb3402112ff37ab4fba","examples/halmark/main.rs":"f42ceef4ee26c1e2b5b917e697ae662099550fece8bb715b2076a55413662c6c","examples/halmark/shader.wgsl":"26c256ec36d6f0e9a1647431ca772766bee4382d64eaa718ba7b488dcfb6bcca","examples/raw-gles.em.html":"70fbe68394a1a4522192de1dcfaf7d399f60d7bdf5de70b708f9bb0417427546","examples/raw-gles.rs":"f41b15e898da0047d33c7bed0dd311ca6fade507ba453c238a7babf789480b6c","examples/ray-traced-triangle/main.rs":"ecbd4625050f1be3d61af83f4effffa11b8baaef127ec17a2d3ca0465cb7d967","examples/ray-traced-triangle/shader.wgsl":"cc10caf92746724a71f6dd0dbc3a71e57b37c7d1d83278556805a535c0728a9d","src/auxil/dxgi/conv.rs":"f451fb0c416a637f11542e9b166a48800be50c48925779b06d40a9bc87958d97","src/auxil/dxgi/exception.rs":"ccf59e9286aa8cceb96155de8e89153676dbce0d914646f502beb5f3e32c4246","src/auxil/dxgi/factory.rs":"1d8cfeb733e34b97d5b879705fc5621ab7b9be578aebb3c3ddadea992effb566","src/auxil/dxgi/mod.rs":"e6c5cc3b73bb97742135d6f35308c42f0822304764978fb8dabb0e848863352a","src/auxil/dxgi/name.rs":"ff942da0da1a497ee4d2be21604f7ba9fae963588105b3d1f63aae1a0c536e82","src/auxil/dxgi/result.rs":"a3b52fd87e512bb94df79c8cadf89a1fbcf7ab0a3a8c7fa1280c2e54cb75d96e","src/auxil/dxgi/time.rs":"b6911800be3873cbe277b2534b3839c6f005f3d9a09341aace4752e207d584a2","src/auxil/mod.rs":"540b9250d9f0e0af709245ce1e284eaca15b27d47550b0ebba2a512da1666c48","src/auxil/renderdoc.rs":"e687710ea0c9e88c9be0e2acd39d136635b835ffb941886b875811b3ec945080","src/dx12/adapter.rs":"33ab5352d9fda9f3d666276b8d4b9d19a2a3e00864e8aad3e928bf7b83af23f1","src/dx12/command.rs":"f11a50b9ada035ed27affcb0e127c63bc62ba8bfae47a9357251b263e1e7f872","src/dx12/conv.rs":"fa0b9936f391662390aa453c169b26aaf65ed3c7a00087c0f8a6b99de22614e7","src/dx12/descriptor.rs":"e3371d7539c44ffc4c7b958b6d948855200bb3c4e7da9577835cc0bca695807b","src/dx12/device.rs":"46115d2eae84934603d0aa61efe924ab2f95eae1432aa98d1d02d48eb37b7e93","src/dx12/instance.rs":"f2ef183443210f3bf1a95d5e750f316042e8b1929e59c8c9145351447ac9e922","src/dx12/mod.rs":"d9a68723214481fd5f02581efd71035d3ff929038168b0cf3cc8647e27d2b06e","src/dx12/sampler.rs":"64464c32452ee63ac49014a03ca3be894ab9b74e11dc853567b5da5f846faae6","src/dx12/shader_compilation.rs":"19daac0f8a1800417ee0e1e1f46bbb4f49b07954468b1abe0182c551679c9d99","src/dx12/suballocation.rs":"85e9077cd293730e4837888b24f348a1e44dde7af7444e8547a401f5f8fdf4a8","src/dx12/types.rs":"3fc7619fc09303eb3c936d4ded6889f94ce9e8b9aa62742ce900baa1b1e1cca7","src/dx12/view.rs":"79b3f7331d9795e60f9b53023cbf0df46c3a05b1e8bd5c7bcca8acdd235b124f","src/dynamic/adapter.rs":"e93f7d082a3950c9e8ccff8a631d251c7598b4b25dda9fe6347dadfa3ba07829","src/dynamic/command.rs":"9635dea15d8a885011d2b8b6b9cc5ffe2126cc3f141f47f7aaf46e1f201abea9","src/dynamic/device.rs":"f00305d56cac0636d4cb86cc44ee69c291bfb3d5f6d5e8d745adce9a28a6a1d5","src/dynamic/instance.rs":"7b515c201e1ca24f24439544dbfa1d19ea1412a4f89bd803e009aed13b021e55","src/dynamic/mod.rs":"b02a3c11b22c896cf66ef206f5d4bb4e24988ecadc29972c572baf347f54aa04","src/dynamic/queue.rs":"d76abb4797e90253386d24584f186dbe1909e772560156b2e891fa043cfefbdc","src/dynamic/surface.rs":"4328c2fe86931f50aa00ac3d6982d0879b774eebf7a507903d1b1898c891fb4d","src/gles/adapter.rs":"6756967585998be1ad772cea1fd1e0bbc644e3c2cb8bd97d2d0b9e383c8b2dc3","src/gles/command.rs":"9d8c10e75c9f289050e49d10a16b0071f022e8fa12ebf112190a6cd511d310ff","src/gles/conv.rs":"7f885dd2bc72641d22f8f2e688ebdd857663bfe315f1b5364ea302f99a05adbf","src/gles/device.rs":"a1e66b2007cedd2d7f28c8f1589757588e143e621e2e52b1813de65482c61150","src/gles/egl.rs":"a47cc262bfe590ecdf4e02e60106231900c26d18f64ad071326d77cffc718ead","src/gles/emscripten.rs":"316d2bb6f2a4bb126dbe68a223f7393399080d116b61c39504454acdf4f9cfaf","src/gles/fence.rs":"083cd49747aba6272002aba0b0c37e5768cdbc2a1b8bacd1a244ee905d3f7b0f","src/gles/mod.rs":"1e68ff6ec48c14a8bb494ee54cf504e7119761d3d9881ce1caef3f9aed10e584","src/gles/queue.rs":"019fe739a478bc02700d0154eac13fbabc8b8c60983ed2ebd56d67695e82bd50","src/gles/shaders/clear.frag":"9133ed8ed97d3641fbb6b5f5ea894a3554c629ccc1b80a5fc9221d7293aa1954","src/gles/shaders/clear.vert":"a543768725f4121ff2e9e1fb5b00644931e9d6f2f946c0ef01968afb5a135abd","src/gles/shaders/srgb_present.frag":"dd9a43c339a2fa4ccf7f6a1854c6f400cabf271a7d5e9230768e9f39d47f3ff5","src/gles/shaders/srgb_present.vert":"6e85d489403d80b81cc94790730bb53b309dfc5eeede8f1ea3412a660f31d357","src/gles/web.rs":"cb5940bf7b2381811675011b640040274f407a7d1908d0f82c813d6a9d3b00f7","src/gles/wgl.rs":"bff33c7ce78c5618b2d656398c2d13d3da980b9ce89c77f774adf9f6132563ef","src/lib.rs":"044cd49d4b48c5bd99c5f8245d7c00c746e76bce8ac6988fabcca8e9db099dc0","src/metal/adapter.rs":"f879d50a69f3d1552280dc44e25fc025ad13ae8d029d0783ed8a222685ad90d6","src/metal/command.rs":"1ec1a9e0e1ccf298c2c416b96e60827173e6584c9061b8dd582b7789545ce60a","src/metal/conv.rs":"85e8168be334ba24d109575a0a7e91b2ad3459403173e99e5cdd5d977cc5c18f","src/metal/device.rs":"52e8d128c7240b9efd99398456225d22ffea51137563d07af9de171b11f2480c","src/metal/layer_observer.rs":"8370a6e443d01739b951b8538ee719a03b69fc0cbac92c748db418fbcc8837b5","src/metal/mod.rs":"f957e28fc01a638ddad25b3fc7c14507f24923b6becaeae3e03f5caff7b58eb2","src/metal/surface.rs":"0855d3f26b3570c1f030cd50e818faac7918cd4a3c68584319c7edf07279788b","src/metal/time.rs":"c32d69f30e846dfcc0e39e01097fb80df63b2bebb6586143bb62494999850246","src/noop/buffer.rs":"89a938411204b33082200a1306fe589587de15142392d7ec591676512e4cfeb2","src/noop/command.rs":"3de99a1a260cfea2e6ca2e76797c1923cc26b069b08362c38798ce27cdc75543","src/noop/mod.rs":"3167878f073b3865092d7ad0ec944162bc627b7d6d5e0a7931d46f1a47c3918c","src/vulkan/adapter.rs":"538a7e69ab9bcf3fb402e068aba2b24b5852f9c5b864d242061788527cd9951d","src/vulkan/command.rs":"e058758398d4ec6fda1d0274d99b92ae541f4263ee804bcb1c42ca96f8610ac0","src/vulkan/conv.rs":"6727c1fa35dd6368850301426948fd536a305c65f257a0ed59b62ca6bbda9ade","src/vulkan/device.rs":"de7764201a624c39c7dbed4663ec49525fe08af3d00a38988e4f399e088dd029","src/vulkan/drm.rs":"09eaa92c6a17e219ee856ffc3fe5f9fe1c15063b4c3dbb7cd20bf2f4f9cac2c7","src/vulkan/instance.rs":"d7e81c1bf92c765dac432205d9932c39d4f1418be12882d34f2f8e63b0b574e4","src/vulkan/mod.rs":"a35b8751f9422ecbe8162d73e045dcc4732e16613e9a1c5c216d097a6c949243","src/vulkan/sampler.rs":"f65729d6df5cce681b7756b3e48074017f0c7f42da69ca55e26cc723cd14ad59"},"package":null} \ No newline at end of file diff --git a/third_party/rust/wgpu-hal/src/vulkan/drm.rs b/third_party/rust/wgpu-hal/src/vulkan/drm.rs index f0a8413cacc0..a51268ebd3b6 100644 --- a/third_party/rust/wgpu-hal/src/vulkan/drm.rs +++ b/third_party/rust/wgpu-hal/src/vulkan/drm.rs @@ -5,6 +5,15 @@ use core::mem::MaybeUninit; use ash::{ext, khr, vk}; +macro_rules! to_u64 { + ($expr:expr) => {{ + #[allow(trivial_numeric_casts)] + let expr = $expr as u64; + assert!(size_of_val(&expr) <= size_of::()); + expr + }}; +} + impl super::Instance { /// Creates a new surface from the given drm configuration. /// @@ -77,12 +86,18 @@ impl super::Instance { let render_devid = libc::makedev(drm_props.render_major as _, drm_props.render_minor as _); - // Various platforms use different widths between `dev_t` and `c_int`, so just - // force-convert to `u64` to keep things portable. + // On most platforms, both `*_devid`s and `st_rdev` are `dev_t`s (which is generally + // observed to be an unsigned integral type no greater than 64 bits). However, on some + // platforms, there divergences from this pattern: + // + // - `armv7-linux-androideabi`: `dev_t` is `c_ulong`, and `*_devid`s are `dev_t`, but + // `st_rdev` is `c_ulonglong`. So, we can't just do a `==` comparison. + // - OpenBSD has `dev_t` on both sides, but is `i32` (N.B., unsigned). Therefore, we + // can't just use `u64::from`. #[allow(clippy::useless_conversion)] if [primary_devid, render_devid] - .map(u64::from) - .contains(&drm_stat.st_rdev) + .map(|devid| to_u64!(devid)) + .contains(&to_u64!(drm_stat.st_rdev)) { physical_device = Some(device) }