wgpu: add api choice wgpu

Author: Firestar99

generated/graphics/wgpu/cargo-gpu/Cargo.toml

@@ -0,0 +1,30 @@
+[workspace]
+members = [
+    "mygraphics",
+    "mygraphics-shaders"
+]
+resolver = "3"
+
+[workspace.package]
+version = "0.1.0"
+authors = ["generated <generated>"]
+edition = "2024"
+license = "MIT"
+repository = ""
+
+[workspace.lints.rust]
+unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
+
+[workspace.dependencies]
+cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bf24eb6060e0c7b0013eceddd23b5d7cee68f4cc" }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
+
+glam = { version = "0.30.9", default-features = false }
+bytemuck = { version = "1.24.0", features = ["derive"] }
+ash = "0.38"
+ash-window = "0.13"
+raw-window-handle = "0.6.2"
+winit = "0.30.0"
+cfg-if = "1.0.0"
+anyhow = "1.0.98"
+

generated/graphics/wgpu/cargo-gpu/mygraphics-shaders/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "mygraphics-shaders"
+version = "0.1.0"
+edition = "2024"
+
+[lints]
+workspace = true
+
+[lib]
+crate-type = ["lib", "dylib"]
+
+[dependencies]
+spirv-std.workspace = true
+glam.workspace = true
+bytemuck.workspace = true

generated/graphics/wgpu/cargo-gpu/mygraphics-shaders/src/lib.rs

@@ -0,0 +1,36 @@
+#![no_std]
+
+use bytemuck::{Pod, Zeroable};
+use core::f32::consts::PI;
+use glam::{Vec3, Vec4, vec2, vec3};
+#[cfg(target_arch = "spirv")]
+use spirv_std::num_traits::Float;
+use spirv_std::spirv;
+
+#[derive(Copy, Clone, Pod, Zeroable)]
+#[repr(C)]
+pub struct ShaderConstants {
+    pub width: u32,
+    pub height: u32,
+    pub time: f32,
+}
+
+#[spirv(fragment)]
+pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
+    *output = Vec4::from((vtx_color, 1.));
+}
+
+#[spirv(vertex)]
+pub fn main_vs(
+    #[spirv(vertex_index)] vert_id: i32,
+    #[spirv(push_constant)] constants: &ShaderConstants,
+    #[spirv(position)] vtx_pos: &mut Vec4,
+    vtx_color: &mut Vec3,
+) {
+    let speed = 0.4;
+    let time = constants.time * speed + vert_id as f32 * (2. * PI * 120. / 360.);
+    let position = vec2(f32::sin(time), f32::cos(time));
+    *vtx_pos = Vec4::from((position, 0.0, 1.0));
+
+    *vtx_color = [vec3(1., 0., 0.), vec3(0., 1., 0.), vec3(0., 0., 1.)][vert_id as usize % 3];
+}

generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "mygraphics"
+publish = false
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+mygraphics-shaders = { path = "../mygraphics-shaders" }
+
+ash.workspace = true
+ash-window.workspace = true
+raw-window-handle.workspace = true
+winit.workspace = true
+anyhow.workspace = true
+bytemuck.workspace = true
+
+[build-dependencies]
+cargo-gpu.workspace = true
+anyhow.workspace = true

generated/graphics/wgpu/cargo-gpu/mygraphics/build.rs

@@ -0,0 +1,24 @@
+use cargo_gpu::Install;
+use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy};
+use std::path::PathBuf;
+
+pub fn main() -> anyhow::Result<()> {
+    let manifest_dir = env!("CARGO_MANIFEST_DIR");
+    let crate_path = [manifest_dir, "..", "mygraphics-shaders"]
+        .iter()
+        .copied()
+        .collect::<PathBuf>();
+
+    let install = Install::from_shader_crate(crate_path.clone()).run()?;
+    let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
+    builder.print_metadata = MetadataPrintout::DependencyOnly;
+    builder.shader_panic_strategy = ShaderPanicStrategy::DebugPrintfThenExit {
+        print_inputs: true,
+        print_backtrace: true,
+    };
+
+    let compile_result = builder.build()?;
+    let spv_path = compile_result.module.unwrap_single();
+    println!("cargo::rustc-env=SHADER_SPV_PATH={}", spv_path.display());
+    Ok(())
+}

graphics/mygraphics/src/main.rs …cs/wgpu/cargo-gpu/mygraphics/src/main.rsgraphics/mygraphics/src/main.rs renamed to generated/graphics/wgpu/cargo-gpu/mygraphics/src/main.rs graphics/mygraphics/src/main.rs renamed to generated/graphics/wgpu/cargo-gpu/mygraphics/src/main.rs

@@ -70,10 +70,10 @@
 // crate-specific exceptions:
 // #![allow()]
 
-pub mod ash_renderer;
+pub mod wgpu_renderer;
 
 pub fn main() -> anyhow::Result<()> {
-    ash_renderer::main()
+    wgpu_renderer::main()
 }
 
 pub fn enable_debug_layer() -> bool {

generated/graphics/wgpu/cargo-gpu/mygraphics/src/wgpu_renderer/mod.rs

@@ -0,0 +1,4 @@
+pub fn main() -> anyhow::Result<()> {
+    println!("wgpu renderer");
+    Ok(())
+}

generated/graphics/wgpu/spirv-builder/Cargo.toml

@@ -0,0 +1,57 @@
+[workspace]
+members = [
+    "mygraphics",
+    "mygraphics-shaders"
+]
+resolver = "3"
+
+[workspace.package]
+version = "0.1.0"
+authors = ["generated <generated>"]
+edition = "2024"
+license = "MIT"
+repository = ""
+
+[workspace.lints.rust]
+unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
+
+[workspace.dependencies]
+# The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
+spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
+
+glam = { version = "0.30.9", default-features = false }
+bytemuck = { version = "1.24.0", features = ["derive"] }
+ash = "0.38"
+ash-window = "0.13"
+raw-window-handle = "0.6.2"
+winit = "0.30.0"
+cfg-if = "1.0.0"
+anyhow = "1.0.98"
+
+# Optimize build scripts, copied from rust-gpu's repo
+# Enable incremental by default in release mode.
+[profile.release]
+incremental = true
+# HACK(eddyb) this is the default but without explicitly specifying it, Cargo
+# will treat the identical settings in `[profile.release.build-override]` below
+# as different sets of `rustc` flags and will not reuse artifacts between them.
+codegen-units = 256
+
+# Compile build-dependencies in release mode with the same settings
+# as regular dependencies (including the incremental enabled above).
+[profile.release.build-override]
+opt-level = 3
+incremental = true
+codegen-units = 256
+
+# HACK(eddyb) reduce the number of linker exports and/or imports, by avoiding
+# inter-CGU linkage, to stay under the 64Ki MSVC limit for `rustc_codegen_spirv`
+# when building it in "debug mode" (only relevant to CI for now, realistically),
+# i.e. working around this issue: https://github.com/rust-lang/rust/issues/53014.
+[profile.dev]
+# HACK(eddyb) fewer inter-crate exports/imports (not just inter-CGU), but sadly
+# not configurable w/o breaking `Cargo.toml` parsing from non-nightly Cargo.
+#
+# rustflags = ["-Zshare-generics=off"]
+codegen-units = 1

generated/graphics/wgpu/spirv-builder/mygraphics-shaders/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "mygraphics-shaders"
+version = "0.1.0"
+edition = "2024"
+
+[lints]
+workspace = true
+
+[lib]
+crate-type = ["lib", "dylib"]
+
+[dependencies]
+spirv-std.workspace = true
+glam.workspace = true
+bytemuck.workspace = true

generated/graphics/wgpu/spirv-builder/mygraphics-shaders/src/lib.rs

@@ -0,0 +1,36 @@
+#![no_std]
+
+use bytemuck::{Pod, Zeroable};
+use core::f32::consts::PI;
+use glam::{Vec3, Vec4, vec2, vec3};
+#[cfg(target_arch = "spirv")]
+use spirv_std::num_traits::Float;
+use spirv_std::spirv;
+
+#[derive(Copy, Clone, Pod, Zeroable)]
+#[repr(C)]
+pub struct ShaderConstants {
+    pub width: u32,
+    pub height: u32,
+    pub time: f32,
+}
+
+#[spirv(fragment)]
+pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
+    *output = Vec4::from((vtx_color, 1.));
+}
+
+#[spirv(vertex)]
+pub fn main_vs(
+    #[spirv(vertex_index)] vert_id: i32,
+    #[spirv(push_constant)] constants: &ShaderConstants,
+    #[spirv(position)] vtx_pos: &mut Vec4,
+    vtx_color: &mut Vec3,
+) {
+    let speed = 0.4;
+    let time = constants.time * speed + vert_id as f32 * (2. * PI * 120. / 360.);
+    let position = vec2(f32::sin(time), f32::cos(time));
+    *vtx_pos = Vec4::from((position, 0.0, 1.0));
+
+    *vtx_color = [vec3(1., 0., 0.), vec3(0., 1., 0.), vec3(0., 0., 1.)][vert_id as usize % 3];
+}