aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamson <16504129+sagudev@users.noreply.github.com>2023-08-21 09:40:06 +0200
committerGitHub <noreply@github.com>2023-08-21 07:40:06 +0000
commitdb2cbff9d6ff988c07992dd54cba12ef9f608d69 (patch)
tree9af6a394e1169cce9619ea7e56553d8fef0a1967
parent85a37210c2651b3c0c5dbfc549e31df042174f4d (diff)
downloadservo-db2cbff9d6ff988c07992dd54cba12ef9f608d69.tar.gz
servo-db2cbff9d6ff988c07992dd54cba12ef9f608d69.zip
Update wgpu to 0.17 (#30147)
-rw-r--r--Cargo.lock223
-rw-r--r--components/script/dom/identityhub.rs2
-rw-r--r--components/webgpu/Cargo.toml10
-rw-r--r--components/webgpu/identity.rs2
-rw-r--r--components/webgpu/lib.rs6
-rw-r--r--servo-tidy.toml7
6 files changed, 159 insertions, 91 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 885c937bd12..afb3d9bbdff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -229,7 +229,7 @@ checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -251,7 +251,7 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -380,7 +380,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn",
+ "syn 1.0.103",
"which",
]
@@ -416,6 +416,9 @@ name = "bitflags"
version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
+dependencies = [
+ "serde",
+]
[[package]]
name = "block"
@@ -604,7 +607,7 @@ checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -736,7 +739,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn",
+ "syn 1.0.103",
"tempfile",
"toml",
]
@@ -891,7 +894,7 @@ dependencies = [
"cocoa-foundation",
"core-foundation 0.9.3",
"core-graphics",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
"objc",
]
@@ -906,7 +909,7 @@ dependencies = [
"block",
"core-foundation 0.9.3",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
"objc",
]
@@ -1117,7 +1120,7 @@ dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.3",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
]
@@ -1129,7 +1132,7 @@ checksum = "e92f5d519093a4178296707dbaa3880eae85a5ef5386675f361a1cf25376e93c"
dependencies = [
"bitflags 1.3.2",
"core-foundation 0.9.3",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
]
@@ -1141,7 +1144,7 @@ checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
dependencies = [
"core-foundation 0.9.3",
"core-graphics",
- "foreign-types",
+ "foreign-types 0.3.2",
"libc",
]
@@ -1239,7 +1242,7 @@ dependencies = [
"quote",
"serde",
"smallvec",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1249,7 +1252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1269,7 +1272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"
dependencies = [
"procedural-masquerade",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1280,12 +1283,12 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "d3d12"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da"
+checksum = "e16e44ab292b1dddfdaf7be62cfd8877df52f2f3fde5858d95bab606be259f20"
dependencies = [
- "bitflags 1.3.2",
- "libloading 0.7.0",
+ "bitflags 2.3.1",
+ "libloading 0.8.0",
"winapi",
]
@@ -1309,7 +1312,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1320,7 +1323,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
dependencies = [
"darling_core",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1362,7 +1365,7 @@ dependencies = [
name = "deny_public_fields"
version = "0.0.1"
dependencies = [
- "syn",
+ "syn 1.0.103",
"synstructure",
]
@@ -1380,7 +1383,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
"synstructure",
]
@@ -1392,7 +1395,7 @@ checksum = "2127768764f1556535c01b5326ef94bd60ff08dcfbdc544d53e69ed155610f5d"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1504,7 +1507,7 @@ name = "dom_struct"
version = "0.0.1"
dependencies = [
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1513,7 +1516,7 @@ version = "0.0.1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1680,7 +1683,7 @@ checksum = "1df9d0cef4b051baf3ef7f9b1674273dc78cd56e02cba60fa187f9c0ff4ff5e0"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -1867,7 +1870,28 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
- "foreign-types-shared",
+ "foreign-types-shared 0.1.1",
+]
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared 0.3.1",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
]
[[package]]
@@ -1877,6 +1901,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
name = "form_urlencoded"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2000,7 +2030,7 @@ checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -2280,21 +2310,21 @@ dependencies = [
[[package]]
name = "gpu-alloc"
-version = "0.5.4"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62"
+checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.3.1",
"gpu-alloc-types",
]
[[package]]
name = "gpu-alloc-types"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5"
+checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.3.1",
]
[[package]]
@@ -2346,7 +2376,7 @@ dependencies = [
"libc",
"muldiv",
"num-rational 0.2.4",
- "paste",
+ "paste 0.1.18",
]
[[package]]
@@ -2658,7 +2688,7 @@ dependencies = [
"cc",
"core-graphics",
"core-text",
- "foreign-types",
+ "foreign-types 0.3.2",
"freetype",
"pkg-config",
]
@@ -2741,7 +2771,7 @@ dependencies = [
"markup5ever",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -3045,9 +3075,9 @@ dependencies = [
[[package]]
name = "js-sys"
-version = "0.3.61"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
dependencies = [
"wasm-bindgen",
]
@@ -3057,7 +3087,7 @@ name = "jstraceable_derive"
version = "0.0.1"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 1.0.103",
"synstructure",
]
@@ -3548,7 +3578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632647502a8bfa82458c07134791fffa7a719f00427d1afd79c3cb6d4960a982"
dependencies = [
"proc-macro2",
- "syn",
+ "syn 1.0.103",
"synstructure",
]
@@ -3629,12 +3659,27 @@ dependencies = [
"bitflags 1.3.2",
"block",
"core-graphics-types",
- "foreign-types",
+ "foreign-types 0.3.2",
"log",
"objc",
]
[[package]]
+name = "metal"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "623b5e6cefd76e58f774bd3cc0c6f5c7615c58c03a97815245a25c3c9bdee318"
+dependencies = [
+ "bitflags 2.3.1",
+ "block",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "log",
+ "objc",
+ "paste 1.0.14",
+]
+
+[[package]]
name = "metrics"
version = "0.0.1"
dependencies = [
@@ -3847,12 +3892,12 @@ checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204"
[[package]]
name = "naga"
-version = "0.12.3"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb"
+checksum = "c1ceaaa4eedaece7e4ec08c55c640ba03dbb73fb812a6570a59bcf1930d0f70e"
dependencies = [
"bit-set",
- "bitflags 1.3.2",
+ "bitflags 2.3.1",
"codespan-reporting",
"hexf-parse",
"indexmap",
@@ -4094,7 +4139,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -4189,7 +4234,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -4388,6 +4433,12 @@ dependencies = [
]
[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
name = "paste-impl"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4429,7 +4480,7 @@ version = "0.2.1"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
"synstructure",
"unicode-xid",
]
@@ -4508,7 +4559,7 @@ dependencies = [
"proc-macro-hack",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -4537,7 +4588,7 @@ checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -5353,7 +5404,7 @@ checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -5418,7 +5469,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1060be2a0bbc35e712ec35ae98119b8def1071a5f2edbe392fd4c899bc2a5f4"
dependencies = [
- "foreign-types",
+ "foreign-types 0.3.2",
"objc",
"objc-foundation",
"thiserror",
@@ -5659,7 +5710,7 @@ dependencies = [
"itertools",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -5680,7 +5731,7 @@ source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -6089,7 +6140,7 @@ dependencies = [
"derive_common",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
"synstructure",
]
@@ -6155,7 +6206,7 @@ dependencies = [
"libc",
"log",
"mach",
- "metal",
+ "metal 0.24.0",
"objc",
"raw-window-handle",
"servo-display-link",
@@ -6197,6 +6248,17 @@ dependencies = [
]
[[package]]
+name = "syn"
+version = "2.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
name = "synstructure"
version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -6204,7 +6266,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
"unicode-xid",
]
@@ -6278,7 +6340,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -6407,7 +6469,7 @@ dependencies = [
"derive_common",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
"synstructure",
]
@@ -6437,7 +6499,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.103",
]
[[package]]
@@ -6827,9 +6889,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
dependencies = [
"cfg-if 1.0.0",
"wasm-bindgen-macro",
@@ -6837,24 +6899,24 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.29",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@@ -6862,22 +6924,22 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.29",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
[[package]]
name = "wayland-client"
@@ -6966,9 +7028,9 @@ dependencies = [
[[package]]
name = "web-sys"
-version = "0.3.61"
+version = "0.3.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
dependencies = [
"js-sys",
"wasm-bindgen",
@@ -7188,9 +7250,9 @@ checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e"
[[package]]
name = "wgpu-core"
-version = "0.16.1"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2"
+checksum = "ecf7454d9386f602f7399225c92dd2fbdcde52c519bc8fb0bd6fbeb388075dc2"
dependencies = [
"arrayvec 0.7.1",
"bit-vec",
@@ -7212,9 +7274,9 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "0.16.2"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448"
+checksum = "6654a13885a17f475e8324efb46dc6986d7aaaa98353330f8de2077b153d0101"
dependencies = [
"android_system_properties",
"arrayvec 0.7.1",
@@ -7224,7 +7286,6 @@ dependencies = [
"block",
"core-graphics-types",
"d3d12",
- "foreign-types",
"gpu-alloc",
"gpu-descriptor",
"js-sys",
@@ -7232,7 +7293,7 @@ dependencies = [
"libc",
"libloading 0.8.0",
"log",
- "metal",
+ "metal 0.26.0",
"naga",
"objc",
"parking_lot 0.12.0",
@@ -7250,9 +7311,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
-version = "0.16.1"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a"
+checksum = "ee64d7398d0c2f9ca48922c902ef69c42d000c759f3db41e355f4a570b052b67"
dependencies = [
"bitflags 2.3.1",
"js-sys",
diff --git a/components/script/dom/identityhub.rs b/components/script/dom/identityhub.rs
index c4d997bcd6d..49822b3d729 100644
--- a/components/script/dom/identityhub.rs
+++ b/components/script/dom/identityhub.rs
@@ -4,12 +4,12 @@
use smallvec::SmallVec;
use webgpu::wgpu::{
- hub::IdentityManager,
id::{
AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandEncoderId, ComputePipelineId,
DeviceId, PipelineLayoutId, RenderBundleId, RenderPipelineId, SamplerId, ShaderModuleId,
TextureId, TextureViewId,
},
+ identity::IdentityManager,
};
use webgpu::wgt::Backend;
diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml
index 199bde2d5d2..a0494808b2e 100644
--- a/components/webgpu/Cargo.toml
+++ b/components/webgpu/Cargo.toml
@@ -22,17 +22,17 @@ servo_config = { path = "../config" }
smallvec = { workspace = true, features = ["serde"] }
webrender_api = { workspace = true }
webrender_traits = { path = "../webrender_traits" }
-wgpu-core = { version = "0.16", features = ["replay", "trace", "serial-pass", "wgsl"] }
-wgpu-types = { version = "0.16" }
+wgpu-core = { version = "0.17", features = ["replay", "trace", "serial-pass", "wgsl"] }
+wgpu-types = { version = "0.17" }
[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies.wgpu-core]
-version = "0.16"
+version = "0.17"
features = ["replay", "trace", "serial-pass", "metal"]
[target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "macos")))'.dependencies.wgpu-core]
-version = "0.16"
+version = "0.17"
features = ["replay", "trace", "serial-pass", "vulkan"]
[target.'cfg(windows)'.dependencies.wgpu-core]
-version = "0.16"
+version = "0.17"
features = ["replay", "trace", "serial-pass", "dx11", "dx12", "vulkan"]
diff --git a/components/webgpu/identity.rs b/components/webgpu/identity.rs
index eb04017911e..e6a9e66cabe 100644
--- a/components/webgpu/identity.rs
+++ b/components/webgpu/identity.rs
@@ -7,12 +7,12 @@ use ipc_channel::ipc::IpcSender;
use msg::constellation_msg::PipelineId;
use serde::{Deserialize, Serialize};
use wgpu::{
- hub::{GlobalIdentityHandlerFactory, IdentityHandler, IdentityHandlerFactory},
id::{
AdapterId, BindGroupId, BindGroupLayoutId, BufferId, CommandBufferId, ComputePipelineId,
DeviceId, PipelineLayoutId, QuerySetId, RenderBundleId, RenderPipelineId, SamplerId,
ShaderModuleId, StagingBufferId, SurfaceId, TextureId, TextureViewId, TypedId,
},
+ identity::{GlobalIdentityHandlerFactory, IdentityHandler, IdentityHandlerFactory},
};
use wgt::Backend;
diff --git a/components/webgpu/lib.rs b/components/webgpu/lib.rs
index 2ecc3779aa1..0eb10a0db77 100644
--- a/components/webgpu/lib.rs
+++ b/components/webgpu/lib.rs
@@ -266,7 +266,7 @@ pub enum WebGPURequest {
struct BufferMapInfo<'a, T> {
buffer_id: id::BufferId,
sender: IpcSender<T>,
- global: &'a wgpu::hub::Global<IdentityRecyclerFactory>,
+ global: &'a wgpu::global::Global<IdentityRecyclerFactory>,
size: usize,
external_id: Option<u64>,
}
@@ -339,7 +339,7 @@ struct WGPU<'a> {
receiver: IpcReceiver<(Option<ErrorScopeId>, WebGPURequest)>,
sender: IpcSender<(Option<ErrorScopeId>, WebGPURequest)>,
script_sender: IpcSender<WebGPUMsg>,
- global: wgpu::hub::Global<IdentityRecyclerFactory>,
+ global: wgpu::global::Global<IdentityRecyclerFactory>,
adapters: Vec<WebGPUAdapter>,
devices: HashMap<WebGPUDevice, PipelineId>,
// Track invalid adapters https://gpuweb.github.io/gpuweb/#invalid
@@ -376,7 +376,7 @@ impl<'a> WGPU<'a> {
receiver,
sender,
script_sender,
- global: wgpu::hub::Global::new(
+ global: wgpu::global::Global::new(
"wgpu-core",
factory,
InstanceDescriptor {
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 124c7857e77..0e2205cc89a 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -83,6 +83,13 @@ packages = [
"windows_x86_64_msvc",
"windows_x86_64_gnullvm",
+ # wgpu has the latest and greates
+ "paste",
+ "syn",
+ "metal",
+ "foreign-types",
+ "foreign-types-shared",
+
# Temporarily duplicated until gleam can be upgrded.
"uuid",