From 195d35371e7b604d6135de06d51b4bc20fb9b648 Mon Sep 17 00:00:00 2001 From: Alex Janka Date: Fri, 2 Aug 2024 13:15:04 +1000 Subject: [PATCH] update librashader --- Cargo.lock | 120 ++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 67e52fc..ecb2690 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -247,15 +247,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" -[[package]] -name = "ash" -version = "0.37.3+1.3.251" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" -dependencies = [ - "libloading 0.7.4", -] - [[package]] name = "ash" version = "0.38.0+1.3.281" @@ -272,7 +263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bbe66c64dce7d22452d8553578d58ad383f17f8e4da9ab1e48cfdaedd916211" dependencies = [ "anyhow", - "ash 0.38.0+1.3.281", + "ash", "plist", "serde", ] @@ -283,7 +274,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52bca67b61cb81e5553babde81b8211f713cb6db79766f80168f3e5f40ea6c82" dependencies = [ - "ash 0.38.0+1.3.281", + "ash", "raw-window-handle 0.6.2", "raw-window-metal", ] @@ -434,7 +425,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.71", ] @@ -1766,7 +1757,7 @@ name = "gb-emu-lib" version = "0.5.1" dependencies = [ "anyhow", - "ash 0.38.0+1.3.281", + "ash", "ash-molten", "ash-window", "async-ringbuf", @@ -2043,7 +2034,7 @@ checksum = "c6287b8071643d2f88055233b1ecfec954819cd5f91ff4095d5f2e2739a37b3a" dependencies = [ "glslang-sys", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "thiserror", ] @@ -2107,18 +2098,6 @@ dependencies = [ "bitflags 2.6.0", ] -[[package]] -name = "gpu-allocator" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" -dependencies = [ - "ash 0.37.3+1.3.251", - "log", - "presser", - "thiserror", -] - [[package]] name = "gpu-allocator" version = "0.26.0" @@ -2132,6 +2111,18 @@ dependencies = [ "windows 0.52.0", ] +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "ash", + "log", + "presser", + "thiserror", +] + [[package]] name = "gpu-descriptor" version = "0.3.0" @@ -2747,15 +2738,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if 1.0.0", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] name = "librashader" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ - "ash 0.38.0+1.3.281", + "ash", "halfbrown", "librashader-cache", "librashader-common", @@ -2771,8 +2762,8 @@ dependencies = [ [[package]] name = "librashader-cache" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "bincode", "blake3", @@ -2787,20 +2778,20 @@ dependencies = [ [[package]] name = "librashader-common" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ - "ash 0.38.0+1.3.281", + "ash", "halfbrown", "num-traits", - "rustc-hash", + "rustc-hash 2.0.0", "wgpu-types", ] [[package]] name = "librashader-preprocess" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "encoding_rs", "librashader-common", @@ -2810,8 +2801,8 @@ dependencies = [ [[package]] name = "librashader-presets" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "librashader-common", "nom", @@ -2826,8 +2817,8 @@ dependencies = [ [[package]] name = "librashader-reflect" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2840,7 +2831,7 @@ dependencies = [ "matches", "naga", "rspirv", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "spirv", "thiserror", @@ -2848,8 +2839,8 @@ dependencies = [ [[package]] name = "librashader-runtime" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "array-concat", "bytemuck", @@ -2864,13 +2855,13 @@ dependencies = [ [[package]] name = "librashader-runtime-vk" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "array-concat", - "ash 0.37.3+1.3.251", + "ash", "bytemuck", - "gpu-allocator 0.25.0", + "gpu-allocator 0.27.0", "librashader-cache", "librashader-common", "librashader-preprocess", @@ -2884,12 +2875,13 @@ dependencies = [ [[package]] name = "librashader-runtime-wgpu" -version = "0.2.7" -source = "git+https://git.alexjanka.com/alex/librashader#71d1ddfa2a237860d4795c73a77554495fcb51c2" +version = "0.2.8" +source = "git+https://git.alexjanka.com/alex/librashader#be4c634614454d1432c602c982f80b63bd29cc27" dependencies = [ "array-concat", "bytemuck", "image 0.25.1", + "librashader-cache", "librashader-common", "librashader-preprocess", "librashader-presets", @@ -3160,8 +3152,7 @@ dependencies = [ "indexmap 2.2.6", "log", "petgraph", - "pp-rs", - "rustc-hash", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3850,15 +3841,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" -[[package]] -name = "pp-rs" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" -dependencies = [ - "unicode-xid", -] - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4198,7 +4180,7 @@ version = "0.12.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cf3a93856b6e5946537278df0d3075596371b1950ccff012f02b0f7eafec8d" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", "spirv", ] @@ -4223,6 +4205,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc_version" version = "0.4.0" @@ -5244,7 +5232,7 @@ dependencies = [ "parking_lot", "profiling", "raw-window-handle 0.6.2", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wgpu-hal", @@ -5259,7 +5247,7 @@ checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", - "ash 0.38.0+1.3.281", + "ash", "bit-set", "bitflags 2.6.0", "block", @@ -5287,7 +5275,7 @@ dependencies = [ "range-alloc", "raw-window-handle 0.6.2", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen",