nordic-dev.net/rust-gpu
2
0
Fork 0
mirror of https://github.com/EmbarkStudios/rust-gpu.git synced 2024-11-25 08:14:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update deps (#833)

Browse Source
This commit is contained in:
Ashley Hauck 2022-01-04 09:02:14 +01:00 committed by GitHub
parent d705a238a1
commit b99fc516e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 164 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
Cargo.lock generated
View File

@ -65,24 +65,33 @@ dependencies = [
]
[[package]]
name = "ash-molten"
version = "0.11.0+1.1.5"
name = "ash"
version = "0.35.0+1.2.203"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc956461ea460ef5bcb4d7449390653a40c871d776e098af156e421f2ec69b46"
checksum = "5a7638ce84f8c84d6fd6faa63aa267574d345181ba591c0eeb5550d4c30cd600"
dependencies = [
"libloading",
]
[[package]]
name = "ash-molten"
version = "0.12.0+1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46b51f10940e9e2022ff1cecbc73ba848d0edda13084f2063980546e945b0e7b"
dependencies = [
"anyhow",
"ash",
"ash 0.35.0+1.2.203",
"plist",
"serde",
]
[[package]]
name = "ash-window"
version = "0.7.0"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f91ce4c6be1a2ba99d3d6cd57d5bae9ac6d6f903b5ae53d6b1dee2edf872af"
checksum = "c2f510c6da81963f828aaaf863983bc51f223fba4e8c3f054d98c941c7e19ee7"
dependencies = [
"ash",
"ash 0.35.0+1.2.203",
"raw-window-handle 0.3.4",
"raw-window-metal",
]
@ -559,8 +568,18 @@ version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858"
dependencies = [
"darling_core",
"darling_macro",
"darling_core 0.10.2",
"darling_macro 0.10.2",
]
[[package]]
name = "darling"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
dependencies = [
"darling_core 0.13.1",
"darling_macro 0.13.1",
]
[[package]]
@ -577,13 +596,38 @@ dependencies = [
"syn",
]
[[package]]
name = "darling_core"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim 0.10.0",
"syn",
]
[[package]]
name = "darling_macro"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
dependencies = [
"darling_core",
"darling_core 0.10.2",
"quote",
"syn",
]
[[package]]
name = "darling_macro"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
dependencies = [
"darling_core 0.13.1",
"quote",
"syn",
]
@ -692,7 +736,7 @@ dependencies = [
name = "example-runner-ash"
version = "0.4.0-alpha.12"
dependencies = [
"ash",
"ash 0.35.0+1.2.203",
"ash-molten",
"ash-window",
"cfg-if 1.0.0",
@ -924,9 +968,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "glow"
version = "0.11.1"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c07210904884e8e2e6a2d7f36f39040a9cefe3b379b721969b5275e9f5b464a"
checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919"
dependencies = [
"js-sys",
"slotmap",
@ -1289,6 +1333,19 @@ dependencies = [
"winapi",
]
[[package]]
name = "mio"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
dependencies = [
"libc",
"log",
"miow",
"ntapi",
"winapi",
]
[[package]]
name = "miow"
version = "0.3.7"
@ -1315,35 +1372,23 @@ dependencies = [
[[package]]
name = "naga"
version = "0.7.3"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "806f448a7ce662ca79ef5484ef8f451a9b7c51b8166c95f5a667228b3825a6ca"
checksum = "bc7216bec6be822a562dda435236539c7fb5aa5e5ceecc8c565e81139ed1d4b0"
dependencies = [
"bit-set",
"bitflags",
"codespan-reporting",
"fxhash",
"hexf-parse",
"indexmap",
"log",
"num-traits",
"petgraph",
"rustc-hash",
"spirv",
"thiserror",
]
[[package]]
name = "ndk"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab"
dependencies = [
"jni-sys",
"ndk-sys",
"num_enum",
"thiserror",
]
[[package]]
name = "ndk"
version = "0.4.0"
@ -1358,17 +1403,16 @@ dependencies = [
]
[[package]]
name = "ndk-glue"
version = "0.3.0"
name = "ndk"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385"
checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d"
dependencies = [
"lazy_static",
"libc",
"log",
"ndk 0.3.0",
"ndk-macro",
"bitflags",
"jni-sys",
"ndk-sys",
"num_enum",
"thiserror",
]
[[package]]
@ -1381,7 +1425,21 @@ dependencies = [
"libc",
"log",
"ndk 0.4.0",
"ndk-macro",
"ndk-macro 0.2.0",
"ndk-sys",
]
[[package]]
name = "ndk-glue"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc291b8de2095cba8dab7cf381bf582ff4c17a09acf854c32e46545b08085d28"
dependencies = [
"lazy_static",
"libc",
"log",
"ndk 0.5.0",
"ndk-macro 0.3.0",
"ndk-sys",
]
@ -1391,13 +1449,26 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d"
dependencies = [
"darling",
"darling 0.10.2",
"proc-macro-crate 0.1.5",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ndk-macro"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
dependencies = [
"darling 0.13.1",
"proc-macro-crate 1.1.0",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ndk-sys"
version = "0.2.2"
@ -1464,7 +1535,7 @@ dependencies = [
"inotify",
"kqueue",
"libc",
"mio",
"mio 0.7.14",
"walkdir",
"winapi",
]
@ -1720,9 +1791,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.35"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "392a54546fda6b7cc663379d0e6ce8b324cf88aecc5a499838e1be9781bdce2e"
checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
dependencies = [
"unicode-xid",
]
@ -1735,9 +1806,9 @@ checksum = "9926767b8b8244d7b6b64546585121d193c3d0b4856ccd656b7bfa9deb91ab6a"
[[package]]
name = "quote"
version = "1.0.10"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
dependencies = [
"proc-macro2",
]
@ -2120,9 +2191,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
[[package]]
name = "smithay-client-toolkit"
version = "0.15.2"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "210cf40de565aaaa085face1d860b17f6aee9f76f9d2816307ea2cc45eeb64f3"
checksum = "1325f292209cee78d5035530932422a30aa4c8fda1a16593ac083c1de211e68a"
dependencies = [
"bitflags",
"calloop",
@ -2216,6 +2287,12 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "structopt"
version = "0.3.25"
@ -2664,16 +2741,16 @@ dependencies = [
[[package]]
name = "wgpu"
version = "0.11.1"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae7181fe6ba5f4b632a9079cc9e922a64555156c87def72c063f94b180c7d68"
checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567"
dependencies = [
"arrayvec",
"js-sys",
"log",
"naga",
"parking_lot",
"raw-window-handle 0.3.4",
"raw-window-handle 0.4.2",
"smallvec",
"wasm-bindgen",
"wasm-bindgen-futures",
@ -2685,20 +2762,21 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "0.11.3"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35600627b6c718ad0e23ed75fb6140bfe32cdf21c8f539ce3c9ab8180e2cb38e"
checksum = "659a371d93a66fd0c15f0a5a730d0877416c82e0c539fd46741673a49f02afad"
dependencies = [
"arrayvec",
"bitflags",
"cfg_aliases",
"codespan-reporting",
"copyless",
"fxhash",
"log",
"naga",
"parking_lot",
"profiling",
"raw-window-handle 0.3.4",
"raw-window-handle 0.4.2",
"smallvec",
"thiserror",
"wgpu-hal",
@ -2707,12 +2785,12 @@ dependencies = [
[[package]]
name = "wgpu-hal"
version = "0.11.5"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af28b29ef0b44cd22dd9895d4349b9d5a687df42f58da234871198637eabe328"
checksum = "1abbd51f4f3d61db9c02dd776f643437823b6fa85e8642b4bb6d278b74335fc1"
dependencies = [
"arrayvec",
"ash",
"ash 0.33.3+1.2.191",
"bit-set",
"bitflags",
"block",
@ -2734,7 +2812,7 @@ dependencies = [
"parking_lot",
"profiling",
"range-alloc",
"raw-window-handle 0.3.4",
"raw-window-handle 0.4.2",
"renderdoc-sys",
"thiserror",
"wasm-bindgen",
@ -2745,9 +2823,9 @@ dependencies = [
[[package]]
name = "wgpu-types"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e15e44ba88ec415466e18e91881319e7c9e96cb905dc623305168aea65b85ccc"
checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2"
dependencies = [
"bitflags",
]
@ -2794,8 +2872,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "winit"
version = "0.25.0"
source = "git+https://github.com/rust-windowing/winit?rev=1b3b82a3c1369c5248a2e6a251230ba6c615e918#1b3b82a3c1369c5248a2e6a251230ba6c615e918"
version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70466a5f4825cc88c92963591b06dbc255420bffe19d847bfcda475e82d079c0"
dependencies = [
"bitflags",
"block",
@ -2808,14 +2887,14 @@ dependencies = [
"lazy_static",
"libc",
"log",
"mio",
"ndk 0.3.0",
"ndk-glue 0.3.0",
"mio 0.8.0",
"ndk 0.5.0",
"ndk-glue 0.5.0",
"ndk-sys",
"objc",
"parking_lot",
"percent-encoding",
"raw-window-handle 0.3.4",
"raw-window-handle 0.4.2",
"smithay-client-toolkit",
"wasm-bindgen",
"wayland-client 0.29.1",

8
examples/runners/ash/Cargo.toml
View File

@ -13,9 +13,9 @@ use-installed-tools = ["spirv-builder/use-installed-tools"]
use-compiled-tools = ["spirv-builder/use-compiled-tools"]
[dependencies]
ash = "0.33.1"
ash-window = "0.7"
winit = { git = "https://github.com/rust-windowing/winit", rev = "1b3b82a3c1369c5248a2e6a251230ba6c615e918" }
ash = "0.35"
ash-window = "0.9"
winit = "0.26"
structopt = "0.3.20"
cfg-if = "1.0.0"
shared = { path = "../../shaders/shared" }
@ -26,4 +26,4 @@ spirv-builder = { path = "../../../crates/spirv-builder", default-features = fal
nix = "0.20.2"
[target.'cfg(target_os = "macos")'.dependencies]
ash-molten = { version = "0.11.0", features = ["pre-built"] }
ash-molten = { version = "0.12.0", features = ["pre-built"] }

24
examples/runners/ash/src/main.rs
View File

@ -221,9 +221,6 @@ pub struct SpvFile {
pub struct RenderBase {
pub window: winit::window::Window,
#[cfg(target_os = "macos")]
pub entry: ash_molten::MoltenEntry,
#[cfg(not(target_os = "macos"))]
pub entry: ash::Entry,
pub instance: ash::Instance,
@ -246,9 +243,9 @@ impl RenderBase {
pub fn new(window: winit::window::Window, options: &Options) -> Self {
cfg_if::cfg_if! {
if #[cfg(target_os = "macos")] {
let entry = ash_molten::MoltenEntry::load();
let entry = ash_molten::load();
} else {
let entry = unsafe { ash::Entry::new().unwrap() };
let entry = unsafe{ash::Entry::load()}.unwrap();
}
}
@ -279,7 +276,7 @@ impl RenderBase {
.application_version(0)
.engine_name(&app_name)
.engine_version(0)
.api_version(vk::make_api_version(1, 2, 0, 0));
.api_version(vk::make_api_version(0, 1, 2, 0));
let instance_create_info = vk::InstanceCreateInfo::builder()
.application_info(&appinfo)
@ -305,7 +302,11 @@ impl RenderBase {
| vk::DebugUtilsMessageSeverityFlagsEXT::WARNING
| vk::DebugUtilsMessageSeverityFlagsEXT::INFO,
)
.message_type(vk::DebugUtilsMessageTypeFlagsEXT::all())
.message_type(
vk::DebugUtilsMessageTypeFlagsEXT::GENERAL
| vk::DebugUtilsMessageTypeFlagsEXT::VALIDATION
| vk::DebugUtilsMessageTypeFlagsEXT::PERFORMANCE,
)
.pfn_user_callback(Some(vulkan_debug_callback));
unsafe {
@ -680,7 +681,7 @@ impl RenderCtx {
let push_constant_range = vk::PushConstantRange::builder()
.offset(0)
.size(std::mem::size_of::<ShaderConstants>() as u32)
.stage_flags(vk::ShaderStageFlags::all())
.stage_flags(vk::ShaderStageFlags::ALL)
.build();
let layout_create_info = vk::PipelineLayoutCreateInfo::builder()
.push_constant_ranges(&[push_constant_range])
@ -956,7 +957,7 @@ impl RenderCtx {
device.cmd_push_constants(
draw_command_buffer,
pipeline.pipeline_layout,
ash::vk::ShaderStageFlags::all(),
ash::vk::ShaderStageFlags::ALL,
0,
any_as_u8_slice(&push_constants),
);
@ -1202,7 +1203,10 @@ impl PipelineDescriptor {
src_alpha_blend_factor: vk::BlendFactor::ZERO,
dst_alpha_blend_factor: vk::BlendFactor::ZERO,
alpha_blend_op: vk::BlendOp::ADD,
color_write_mask: vk::ColorComponentFlags::all(),
color_write_mask: vk::ColorComponentFlags::R
| vk::ColorComponentFlags::G
| vk::ColorComponentFlags::B
| vk::ColorComponentFlags::A,
}]);
let color_blend = vk::PipelineColorBlendStateCreateInfo::builder()
.logic_op(vk::LogicOp::CLEAR)

4
examples/runners/wgpu/Cargo.toml
View File

@ -19,8 +19,8 @@ use-compiled-tools = ["spirv-builder/use-compiled-tools"]
cfg-if = "1.0.0"
shared = { path = "../../shaders/shared" }
futures = { version = "0.3", default-features = false, features = ["std", "executor"] }
wgpu = { version = "0.11", features = ["spirv"] }
winit = { git = "https://github.com/rust-windowing/winit", rev = "1b3b82a3c1369c5248a2e6a251230ba6c615e918" }
wgpu = { version = "0.12", features = ["spirv"] }
winit = { version = "0.26" }
structopt = "0.3"
strum = { version = "0.23.0", default_features = false, features = ["std", "derive"] }
bytemuck = "1.6.3"

3
examples/runners/wgpu/src/graphics.rs
View File

@ -300,7 +300,7 @@ fn create_pipeline(
strip_index_format: None,
front_face: wgpu::FrontFace::Ccw,
cull_mode: None,
clamp_depth: false,
unclipped_depth: false,
polygon_mode: wgpu::PolygonMode::Fill,
conservative: false,
},
@ -319,6 +319,7 @@ fn create_pipeline(
write_mask: wgpu::ColorWrites::ALL,
}],
}),
multiview: None,
})
}