From 092a023e84d35b5086f956b3d9bfd51ae4baf7b0 Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Tue, 23 May 2023 18:04:30 +0300 Subject: [PATCH 1/8] Update Cargo.lock to point to an existing commit --- bevy-app/Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bevy-app/Cargo.lock b/bevy-app/Cargo.lock index 38f7319..8df141c 100644 --- a/bevy-app/Cargo.lock +++ b/bevy-app/Cargo.lock @@ -2028,7 +2028,7 @@ dependencies = [ [[package]] name = "naga" version = "0.11.0" -source = "git+https://github.com/bevy-rust-gpu/naga?branch=spv-in-break-if-v0.11.0#6aea73fa48853fd25eb07405dedd00b81709f376" +source = "git+https://github.com/bevy-rust-gpu/naga?branch=spv-in-break-if-v0.11.0#001a42b96d800897b70bba9bb5e9691d6c7058b6" dependencies = [ "bit-set", "bitflags", From 5794a0fc4e1d37589568198a556fbcfdd53cfa29 Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Fri, 26 May 2023 16:23:35 +0300 Subject: [PATCH 2/8] Add prime computation example taken from https://github.com/EmbarkStudios/rust-gpu/blob/795f433fdd1d01974bd48a5d810d85214b6606b4/examples/shaders/compute-shader/src/lib.rs --- rust-gpu/crates/shader/src/lib.rs | 33 ++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/rust-gpu/crates/shader/src/lib.rs b/rust-gpu/crates/shader/src/lib.rs index 00b5965..cbdbad3 100644 --- a/rust-gpu/crates/shader/src/lib.rs +++ b/rust-gpu/crates/shader/src/lib.rs @@ -29,7 +29,7 @@ use rust_gpu_sdf::{ }; use spirv_std::{ arch::{ddx, ddy}, - glam::{Mat3, Vec2, Vec3, Vec4, Vec4Swizzles}, + glam::{Mat3, UVec3, Vec2, Vec3, Vec4, Vec4Swizzles}, spirv, }; @@ -453,3 +453,34 @@ pub fn fragment_sdf_3d( } */ } + +pub fn collatz(mut n: u32) -> Option { + let mut i = 0; + if n == 0 { + return None; + } + while n != 1 { + n = if n % 2 == 0 { + n / 2 + } else { + // Overflow? (i.e. 3*n + 1 > 0xffff_ffff) + if n >= 0x5555_5555 { + return None; + } + // TODO: Use this instead when/if checked add/mul can work: n.checked_mul(3)?.checked_add(1)? + 3 * n + 1 + }; + i += 1; + } + Some(i) +} + +// LocalSize/numthreads of (x = 64, y = 1, z = 1) +#[spirv(compute(threads(64)))] +pub fn compute_primes( + #[spirv(global_invocation_id)] id: UVec3, + #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] prime_indices: &mut [u32], +) { + let index = id.x as usize; + prime_indices[index] = collatz(prime_indices[index]).unwrap_or(u32::MAX); +} From f42e28a315f4acb4041e5d29abf2bca61e16a4ed Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Fri, 26 May 2023 16:54:04 +0300 Subject: [PATCH 3/8] Add a frankenstein's monster of bevy and rust-gpu examples together --- bevy-app/crates/viewer/examples/compute.rs | 255 +++++++++++++++++++++ 1 file changed, 255 insertions(+) create mode 100644 bevy-app/crates/viewer/examples/compute.rs diff --git a/bevy-app/crates/viewer/examples/compute.rs b/bevy-app/crates/viewer/examples/compute.rs new file mode 100644 index 0000000..243508f --- /dev/null +++ b/bevy-app/crates/viewer/examples/compute.rs @@ -0,0 +1,255 @@ +use std::borrow::Cow; + +use bevy::{ + prelude::{App, AssetPlugin, PluginGroup, Commands, ResMut, Assets, Image, Plugin, Handle, Resource, Deref, Res, FromWorld, World, AssetServer, Vec2, Camera2dBundle, IntoSystemConfig}, + utils::default, + DefaultPlugins, render::{render_resource::{Extent3d, BindGroupLayout, CachedComputePipelineId, BindGroupDescriptor, BindGroupEntry, BindingResource, BindGroup, BindGroupLayoutDescriptor, BindGroupLayoutEntry, ShaderStages, BindingType, StorageTextureAccess, TextureFormat, TextureViewDimension, PipelineCache, ComputePipelineDescriptor, TextureDimension, TextureUsages, CachedPipelineState, ComputePassDescriptor}, extract_resource::{ExtractResourcePlugin, ExtractResource}, RenderApp, render_asset::RenderAssets, renderer::{RenderDevice, RenderContext}, RenderSet, render_graph::{RenderGraph, self}}, sprite::{SpriteBundle, Sprite}, +}; +use bevy_rust_gpu::{RustGpuPlugin, RustGpuBuilderOutput}; + +/// Workspace-relative path to SPIR-V shader +const SHADER_PATH: &'static str = "rust-gpu/shader.rust-gpu.msgpack"; + +// const ENTRY_POINTS_PATH: &'static str = "crates/viewer/entry_points.json"; + +// const ENTRY_POINT: &str = "compute_primes"; + +const SIZE: (u32, u32) = (1280, 720); +const WORKGROUP_SIZE: u32 = 1; + + +fn main() { + let mut app = App::default(); + + // Add default plugins + app.add_plugins(DefaultPlugins.set( + // Configure the asset plugin to watch the workspace path for changes + AssetPlugin { + watch_for_changes: true, + ..default() + }, + )); + + // Add the Rust-GPU plugin + app.add_plugin(RustGpuPlugin::default()); + + app.add_plugin(PrimeTexturePlugin) + .add_startup_system(setup) + .run(); + + // Setup scene + app.add_startup_system(setup); + + // Run + app.run(); +} + +struct PrimeTexturePlugin; + +#[derive(Resource, Clone, Deref, ExtractResource)] +struct PrimeTextureImage(Handle); + +#[derive(Resource)] +struct GameOfLifeImageBindGroup(BindGroup); + + + +#[derive(Resource)] +pub struct GameOfLifePipeline { + texture_bind_group_layout: BindGroupLayout, + init_pipeline: CachedComputePipelineId +} + +impl Plugin for PrimeTexturePlugin { + fn build(&self, app: &mut App) { + // Extract the game of life image resource from the main world into the render world + // for operation on by the compute shader and display on the sprite. + app.add_plugin(ExtractResourcePlugin::::default()); + let render_app = app.sub_app_mut(RenderApp); + render_app + .init_resource::() + .add_system(queue_bind_group.in_set(RenderSet::Queue)); + + let mut render_graph = render_app.world.resource_mut::(); + render_graph.add_node("game_of_life", GameOfLifeNode::default()); + render_graph.add_node_edge( + "game_of_life", + bevy::render::main_graph::node::CAMERA_DRIVER, + ); + } +} + + +fn queue_bind_group( + mut commands: Commands, + pipeline: Res, + gpu_images: Res>, + game_of_life_image: Res, + render_device: Res, +) { + let view = &gpu_images[&game_of_life_image.0]; + let bind_group = render_device.create_bind_group(&BindGroupDescriptor { + label: None, + layout: &pipeline.texture_bind_group_layout, + entries: &[BindGroupEntry { + binding: 0, + resource: BindingResource::TextureView(&view.texture_view), + }], + }); + commands.insert_resource(GameOfLifeImageBindGroup(bind_group)); +} + +impl FromWorld for GameOfLifePipeline { + fn from_world(world: &mut World) -> Self { + let texture_bind_group_layout = + world + .resource::() + .create_bind_group_layout(&BindGroupLayoutDescriptor { + label: None, + entries: &[BindGroupLayoutEntry { + binding: 0, + visibility: ShaderStages::COMPUTE, + ty: BindingType::StorageTexture { + access: StorageTextureAccess::ReadWrite, + format: TextureFormat::Rgba8Unorm, + view_dimension: TextureViewDimension::D2, + }, + count: None, + }], + }); + let shader = world + .resource::() + .load::(SHADER_PATH); + + let pipeline_cache = world.resource::(); + let init_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { + label: None, + layout: vec![texture_bind_group_layout.clone()], + push_constant_ranges: Vec::new(), + shader: todo!("How do I generate bevy shader from the RustGpuBuilderOutput {shader:?}?"), + shader_defs: vec![], + entry_point: Cow::from("compute_primes"), + }); + + + GameOfLifePipeline { + texture_bind_group_layout, + init_pipeline, + } + } +} + + +fn setup(mut commands: Commands, mut images: ResMut>) { + let mut image = Image::new_fill( + Extent3d { + width: SIZE.0, + height: SIZE.1, + depth_or_array_layers: 1, + }, + TextureDimension::D2, + &[0, 0, 0, 255], + TextureFormat::Rgba8Unorm, + ); + image.texture_descriptor.usage = + TextureUsages::COPY_DST | TextureUsages::STORAGE_BINDING | TextureUsages::TEXTURE_BINDING; + let image = images.add(image); + + commands.spawn(SpriteBundle { + sprite: Sprite { + custom_size: Some(Vec2::new(SIZE.0 as f32, SIZE.1 as f32)), + ..default() + }, + texture: image.clone(), + ..default() + }); + commands.spawn(Camera2dBundle::default()); + + commands.insert_resource(PrimeTextureImage(image)); +} + + + +enum GameOfLifeState { + Loading, + Init, + Update, +} + +struct GameOfLifeNode { + state: GameOfLifeState, +} + +impl Default for GameOfLifeNode { + fn default() -> Self { + Self { + state: GameOfLifeState::Loading, + } + } +} + +impl render_graph::Node for GameOfLifeNode { + fn update(&mut self, world: &mut World) { + let pipeline = world.resource::(); + let pipeline_cache = world.resource::(); + + // if the corresponding pipeline has loaded, transition to the next stage + match self.state { + GameOfLifeState::Loading => { + if let CachedPipelineState::Ok(_) = + pipeline_cache.get_compute_pipeline_state(pipeline.init_pipeline) + { + self.state = GameOfLifeState::Init; + } + } + // FIXME(samoylovfp): there is only one pipeline + GameOfLifeState::Init => { + if let CachedPipelineState::Ok(_) = + pipeline_cache.get_compute_pipeline_state(pipeline.init_pipeline) + { + self.state = GameOfLifeState::Update; + } + } + GameOfLifeState::Update => {} + } + } + + fn run( + &self, + _graph: &mut render_graph::RenderGraphContext, + render_context: &mut RenderContext, + world: &World, + ) -> Result<(), render_graph::NodeRunError> { + let texture_bind_group = &world.resource::().0; + let pipeline_cache = world.resource::(); + let pipeline = world.resource::(); + + let mut pass = render_context + .command_encoder() + .begin_compute_pass(&ComputePassDescriptor::default()); + + pass.set_bind_group(0, texture_bind_group, &[]); + + // select the pipeline based on the current state + match self.state { + GameOfLifeState::Loading => {} + GameOfLifeState::Init => { + let init_pipeline = pipeline_cache + .get_compute_pipeline(pipeline.init_pipeline) + .unwrap(); + pass.set_pipeline(init_pipeline); + pass.dispatch_workgroups(SIZE.0 / WORKGROUP_SIZE, SIZE.1 / WORKGROUP_SIZE, 1); + } + // FIXME(samoylovfp): there is only one pipeline + GameOfLifeState::Update => { + let update_pipeline = pipeline_cache + .get_compute_pipeline(pipeline.init_pipeline) + .unwrap(); + pass.set_pipeline(update_pipeline); + pass.dispatch_workgroups(SIZE.0 / WORKGROUP_SIZE, SIZE.1 / WORKGROUP_SIZE, 1); + } + } + + Ok(()) + } +} \ No newline at end of file From 9aa3c9a2f9e4dd894179e606e9a4719c24a11a74 Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Sun, 11 Jun 2023 17:35:07 +0300 Subject: [PATCH 4/8] Reset "compute.rs" to bevy compute example --- bevy-app/crates/viewer/examples/compute.rs | 172 ++++++++++----------- 1 file changed, 81 insertions(+), 91 deletions(-) diff --git a/bevy-app/crates/viewer/examples/compute.rs b/bevy-app/crates/viewer/examples/compute.rs index 243508f..3958d4b 100644 --- a/bevy-app/crates/viewer/examples/compute.rs +++ b/bevy-app/crates/viewer/examples/compute.rs @@ -1,70 +1,74 @@ -use std::borrow::Cow; +//! A compute shader that simulates Conway's Game of Life. +//! +//! Compute shaders use the GPU for computing arbitrary information, that may be independent of what +//! is rendered to the screen. use bevy::{ - prelude::{App, AssetPlugin, PluginGroup, Commands, ResMut, Assets, Image, Plugin, Handle, Resource, Deref, Res, FromWorld, World, AssetServer, Vec2, Camera2dBundle, IntoSystemConfig}, - utils::default, - DefaultPlugins, render::{render_resource::{Extent3d, BindGroupLayout, CachedComputePipelineId, BindGroupDescriptor, BindGroupEntry, BindingResource, BindGroup, BindGroupLayoutDescriptor, BindGroupLayoutEntry, ShaderStages, BindingType, StorageTextureAccess, TextureFormat, TextureViewDimension, PipelineCache, ComputePipelineDescriptor, TextureDimension, TextureUsages, CachedPipelineState, ComputePassDescriptor}, extract_resource::{ExtractResourcePlugin, ExtractResource}, RenderApp, render_asset::RenderAssets, renderer::{RenderDevice, RenderContext}, RenderSet, render_graph::{RenderGraph, self}}, sprite::{SpriteBundle, Sprite}, + render::{ + extract_resource::{ExtractResource, ExtractResourcePlugin}, + render_asset::RenderAssets, + render_graph::{self, RenderGraph}, + renderer::{RenderContext, RenderDevice}, + RenderApp, RenderSet, render_resource::{Extent3d, TextureDimension, TextureFormat, TextureUsages, BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, BindGroupLayout, CachedComputePipelineId, BindGroupLayoutDescriptor, BindGroupLayoutEntry, ShaderStages, BindingType, StorageTextureAccess, TextureViewDimension, PipelineCache, ComputePipelineDescriptor, CachedPipelineState, ComputePassDescriptor}, + }, + window::{WindowPlugin, Window}, prelude::{ClearColor, Color, default, Commands, ResMut, Assets, Image, Vec2, Camera2dBundle, Plugin, App, Resource, Deref, Handle, Res, FromWorld, World, AssetServer, IntoSystemConfig, PluginGroup}, DefaultPlugins, sprite::{SpriteBundle, Sprite}, }; -use bevy_rust_gpu::{RustGpuPlugin, RustGpuBuilderOutput}; - -/// Workspace-relative path to SPIR-V shader -const SHADER_PATH: &'static str = "rust-gpu/shader.rust-gpu.msgpack"; - -// const ENTRY_POINTS_PATH: &'static str = "crates/viewer/entry_points.json"; - -// const ENTRY_POINT: &str = "compute_primes"; +use std::borrow::Cow; const SIZE: (u32, u32) = (1280, 720); -const WORKGROUP_SIZE: u32 = 1; - +const WORKGROUP_SIZE: u32 = 8; fn main() { - let mut app = App::default(); - - // Add default plugins - app.add_plugins(DefaultPlugins.set( - // Configure the asset plugin to watch the workspace path for changes - AssetPlugin { - watch_for_changes: true, + App::new() + .insert_resource(ClearColor(Color::BLACK)) + .add_plugins(DefaultPlugins.set(WindowPlugin { + primary_window: Some(Window { + // uncomment for unthrottled FPS + // present_mode: bevy::window::PresentMode::AutoNoVsync, + ..default() + }), ..default() - }, - )); - - // Add the Rust-GPU plugin - app.add_plugin(RustGpuPlugin::default()); - - app.add_plugin(PrimeTexturePlugin) + })) + .add_plugin(GameOfLifeComputePlugin) .add_startup_system(setup) .run(); - - // Setup scene - app.add_startup_system(setup); - - // Run - app.run(); } -struct PrimeTexturePlugin; - -#[derive(Resource, Clone, Deref, ExtractResource)] -struct PrimeTextureImage(Handle); - -#[derive(Resource)] -struct GameOfLifeImageBindGroup(BindGroup); - +fn setup(mut commands: Commands, mut images: ResMut>) { + let mut image = Image::new_fill( + Extent3d { + width: SIZE.0, + height: SIZE.1, + depth_or_array_layers: 1, + }, + TextureDimension::D2, + &[0, 0, 0, 255], + TextureFormat::Rgba8Unorm, + ); + image.texture_descriptor.usage = + TextureUsages::COPY_DST | TextureUsages::STORAGE_BINDING | TextureUsages::TEXTURE_BINDING; + let image = images.add(image); + commands.spawn(SpriteBundle { + sprite: Sprite { + custom_size: Some(Vec2::new(SIZE.0 as f32, SIZE.1 as f32)), + ..default() + }, + texture: image.clone(), + ..default() + }); + commands.spawn(Camera2dBundle::default()); -#[derive(Resource)] -pub struct GameOfLifePipeline { - texture_bind_group_layout: BindGroupLayout, - init_pipeline: CachedComputePipelineId + commands.insert_resource(GameOfLifeImage(image)); } -impl Plugin for PrimeTexturePlugin { +pub struct GameOfLifeComputePlugin; + +impl Plugin for GameOfLifeComputePlugin { fn build(&self, app: &mut App) { // Extract the game of life image resource from the main world into the render world // for operation on by the compute shader and display on the sprite. - app.add_plugin(ExtractResourcePlugin::::default()); + app.add_plugin(ExtractResourcePlugin::::default()); let render_app = app.sub_app_mut(RenderApp); render_app .init_resource::() @@ -79,15 +83,20 @@ impl Plugin for PrimeTexturePlugin { } } +#[derive(Resource, Clone, Deref, ExtractResource)] +struct GameOfLifeImage(Handle); + +#[derive(Resource)] +struct GameOfLifeImageBindGroup(BindGroup); fn queue_bind_group( mut commands: Commands, pipeline: Res, gpu_images: Res>, - game_of_life_image: Res, + game_of_life_image: Res, render_device: Res, ) { - let view = &gpu_images[&game_of_life_image.0]; + let view = gpu_images.get(&game_of_life_image.0).unwrap(); let bind_group = render_device.create_bind_group(&BindGroupDescriptor { label: None, layout: &pipeline.texture_bind_group_layout, @@ -99,6 +108,13 @@ fn queue_bind_group( commands.insert_resource(GameOfLifeImageBindGroup(bind_group)); } +#[derive(Resource)] +pub struct GameOfLifePipeline { + texture_bind_group_layout: BindGroupLayout, + init_pipeline: CachedComputePipelineId, + update_pipeline: CachedComputePipelineId, +} + impl FromWorld for GameOfLifePipeline { fn from_world(world: &mut World) -> Self { let texture_bind_group_layout = @@ -119,57 +135,33 @@ impl FromWorld for GameOfLifePipeline { }); let shader = world .resource::() - .load::(SHADER_PATH); - + .load("shaders/game_of_life.wgsl"); let pipeline_cache = world.resource::(); let init_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { label: None, layout: vec![texture_bind_group_layout.clone()], push_constant_ranges: Vec::new(), - shader: todo!("How do I generate bevy shader from the RustGpuBuilderOutput {shader:?}?"), + shader: shader.clone(), shader_defs: vec![], - entry_point: Cow::from("compute_primes"), + entry_point: Cow::from("init"), + }); + let update_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { + label: None, + layout: vec![texture_bind_group_layout.clone()], + push_constant_ranges: Vec::new(), + shader, + shader_defs: vec![], + entry_point: Cow::from("update"), }); - GameOfLifePipeline { texture_bind_group_layout, init_pipeline, + update_pipeline, } } } - -fn setup(mut commands: Commands, mut images: ResMut>) { - let mut image = Image::new_fill( - Extent3d { - width: SIZE.0, - height: SIZE.1, - depth_or_array_layers: 1, - }, - TextureDimension::D2, - &[0, 0, 0, 255], - TextureFormat::Rgba8Unorm, - ); - image.texture_descriptor.usage = - TextureUsages::COPY_DST | TextureUsages::STORAGE_BINDING | TextureUsages::TEXTURE_BINDING; - let image = images.add(image); - - commands.spawn(SpriteBundle { - sprite: Sprite { - custom_size: Some(Vec2::new(SIZE.0 as f32, SIZE.1 as f32)), - ..default() - }, - texture: image.clone(), - ..default() - }); - commands.spawn(Camera2dBundle::default()); - - commands.insert_resource(PrimeTextureImage(image)); -} - - - enum GameOfLifeState { Loading, Init, @@ -202,10 +194,9 @@ impl render_graph::Node for GameOfLifeNode { self.state = GameOfLifeState::Init; } } - // FIXME(samoylovfp): there is only one pipeline GameOfLifeState::Init => { if let CachedPipelineState::Ok(_) = - pipeline_cache.get_compute_pipeline_state(pipeline.init_pipeline) + pipeline_cache.get_compute_pipeline_state(pipeline.update_pipeline) { self.state = GameOfLifeState::Update; } @@ -240,10 +231,9 @@ impl render_graph::Node for GameOfLifeNode { pass.set_pipeline(init_pipeline); pass.dispatch_workgroups(SIZE.0 / WORKGROUP_SIZE, SIZE.1 / WORKGROUP_SIZE, 1); } - // FIXME(samoylovfp): there is only one pipeline GameOfLifeState::Update => { let update_pipeline = pipeline_cache - .get_compute_pipeline(pipeline.init_pipeline) + .get_compute_pipeline(pipeline.update_pipeline) .unwrap(); pass.set_pipeline(update_pipeline); pass.dispatch_workgroups(SIZE.0 / WORKGROUP_SIZE, SIZE.1 / WORKGROUP_SIZE, 1); @@ -252,4 +242,4 @@ impl render_graph::Node for GameOfLifeNode { Ok(()) } -} \ No newline at end of file +} From cef41913026956c44ae0e6f15081f51340a9dbcc Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Sun, 11 Jun 2023 17:35:21 +0300 Subject: [PATCH 5/8] cargo fmt --- bevy-app/crates/viewer/examples/compute.rs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/bevy-app/crates/viewer/examples/compute.rs b/bevy-app/crates/viewer/examples/compute.rs index 3958d4b..9845efd 100644 --- a/bevy-app/crates/viewer/examples/compute.rs +++ b/bevy-app/crates/viewer/examples/compute.rs @@ -4,14 +4,28 @@ //! is rendered to the screen. use bevy::{ + prelude::{ + default, App, AssetServer, Assets, Camera2dBundle, ClearColor, Color, Commands, Deref, + FromWorld, Handle, Image, IntoSystemConfig, Plugin, PluginGroup, Res, ResMut, Resource, + Vec2, World, + }, render::{ extract_resource::{ExtractResource, ExtractResourcePlugin}, render_asset::RenderAssets, render_graph::{self, RenderGraph}, + render_resource::{ + BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout, + BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingResource, BindingType, + CachedComputePipelineId, CachedPipelineState, ComputePassDescriptor, + ComputePipelineDescriptor, Extent3d, PipelineCache, ShaderStages, StorageTextureAccess, + TextureDimension, TextureFormat, TextureUsages, TextureViewDimension, + }, renderer::{RenderContext, RenderDevice}, - RenderApp, RenderSet, render_resource::{Extent3d, TextureDimension, TextureFormat, TextureUsages, BindGroup, BindGroupDescriptor, BindGroupEntry, BindingResource, BindGroupLayout, CachedComputePipelineId, BindGroupLayoutDescriptor, BindGroupLayoutEntry, ShaderStages, BindingType, StorageTextureAccess, TextureViewDimension, PipelineCache, ComputePipelineDescriptor, CachedPipelineState, ComputePassDescriptor}, + RenderApp, RenderSet, }, - window::{WindowPlugin, Window}, prelude::{ClearColor, Color, default, Commands, ResMut, Assets, Image, Vec2, Camera2dBundle, Plugin, App, Resource, Deref, Handle, Res, FromWorld, World, AssetServer, IntoSystemConfig, PluginGroup}, DefaultPlugins, sprite::{SpriteBundle, Sprite}, + sprite::{Sprite, SpriteBundle}, + window::{Window, WindowPlugin}, + DefaultPlugins, }; use std::borrow::Cow; From 11f6fb30a80aaba2163881cb62358c62922d09d1 Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Sun, 11 Jun 2023 18:25:42 +0300 Subject: [PATCH 6/8] Use rust-gpu built spirv for shader --- bevy-app/Cargo.lock | 1 + bevy-app/crates/viewer/Cargo.toml | 1 + bevy-app/crates/viewer/examples/compute.rs | 49 ++++++++++++++++++---- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/bevy-app/Cargo.lock b/bevy-app/Cargo.lock index 8df141c..c3aa3d4 100644 --- a/bevy-app/Cargo.lock +++ b/bevy-app/Cargo.lock @@ -3043,6 +3043,7 @@ version = "0.1.0" dependencies = [ "bevy", "bevy-rust-gpu", + "rmp-serde", "rust-gpu-bridge", "rust-gpu-sdf", ] diff --git a/bevy-app/crates/viewer/Cargo.toml b/bevy-app/crates/viewer/Cargo.toml index 5b42d77..ebd9dc6 100644 --- a/bevy-app/crates/viewer/Cargo.toml +++ b/bevy-app/crates/viewer/Cargo.toml @@ -13,6 +13,7 @@ path = "examples/standard-material.rs" [dependencies] bevy = { version = "0.10.0", features = ["spirv_shader_passthrough"] } +rmp-serde="1.1.1" bevy-rust-gpu = { git = "https://github.com/bevy-rust-gpu/bevy-rust-gpu", tag = "v0.5.0" } rust-gpu-bridge = { git = "https://github.com/bevy-rust-gpu/rust-gpu-bridge", features = ["glam"], tag = "v0.5.0" } diff --git a/bevy-app/crates/viewer/examples/compute.rs b/bevy-app/crates/viewer/examples/compute.rs index 9845efd..c153736 100644 --- a/bevy-app/crates/viewer/examples/compute.rs +++ b/bevy-app/crates/viewer/examples/compute.rs @@ -4,10 +4,11 @@ //! is rendered to the screen. use bevy::{ + asset::{AssetLoader, LoadedAsset}, prelude::{ - default, App, AssetServer, Assets, Camera2dBundle, ClearColor, Color, Commands, Deref, - FromWorld, Handle, Image, IntoSystemConfig, Plugin, PluginGroup, Res, ResMut, Resource, - Vec2, World, + default, AddAsset, App, AssetServer, Assets, Camera2dBundle, ClearColor, Color, Commands, + Deref, FromWorld, Handle, Image, IntoSystemConfig, Plugin, PluginGroup, Res, ResMut, + Resource, Shader, Vec2, World, info, }, render::{ extract_resource::{ExtractResource, ExtractResourcePlugin}, @@ -27,6 +28,7 @@ use bevy::{ window::{Window, WindowPlugin}, DefaultPlugins, }; +use bevy_rust_gpu::RustGpuBuilderOutput; use std::borrow::Cow; const SIZE: (u32, u32) = (1280, 720); @@ -43,6 +45,7 @@ fn main() { }), ..default() })) + .init_asset_loader::() .add_plugin(GameOfLifeComputePlugin) .add_startup_system(setup) .run(); @@ -149,23 +152,26 @@ impl FromWorld for GameOfLifePipeline { }); let shader = world .resource::() - .load("shaders/game_of_life.wgsl"); + .load("rust-gpu/shader.rust-gpu.msgpack"); + // let shader = world + // .resource::() + // .load("gol.wgsl"); let pipeline_cache = world.resource::(); let init_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { - label: None, + label: Some("init_compute_primes".into()), layout: vec![texture_bind_group_layout.clone()], push_constant_ranges: Vec::new(), shader: shader.clone(), shader_defs: vec![], - entry_point: Cow::from("init"), + entry_point: Cow::from("compute_primes"), }); let update_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { - label: None, + label: Some("update_compute_primes".into()), layout: vec![texture_bind_group_layout.clone()], push_constant_ranges: Vec::new(), shader, shader_defs: vec![], - entry_point: Cow::from("update"), + entry_point: Cow::from("compute_primes"), }); GameOfLifePipeline { @@ -257,3 +263,30 @@ impl render_graph::Node for GameOfLifeNode { Ok(()) } } + +#[derive(Default)] +struct RustGpuMsgpackLoader; + +impl AssetLoader for RustGpuMsgpackLoader { + fn load<'a>( + &'a self, + bytes: &'a [u8], + load_context: &'a mut bevy::asset::LoadContext, + ) -> bevy::utils::BoxedFuture<'a, Result<(), bevy::asset::Error>> { + Box::pin(async move { + let spirv_bytes: RustGpuBuilderOutput = rmp_serde::from_slice(bytes).unwrap(); + let shader = match spirv_bytes.modules { + bevy_rust_gpu::RustGpuBuilderModules::Single(s) => { + Shader::from_spirv(s) + }, + bevy_rust_gpu::RustGpuBuilderModules::Multi(_) => todo!(), + }; + load_context.set_default_asset(LoadedAsset::new(shader)); + Ok(()) + }) + } + + fn extensions(&self) -> &[&str] { + &["rust-gpu.msgpack"] + } +} From 1ddc4fbdea385ef06cd63ca778c644caf2e1a505 Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Sun, 11 Jun 2023 18:26:07 +0300 Subject: [PATCH 7/8] Update shader to match buffer format --- rust-gpu/crates/shader/src/lib.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rust-gpu/crates/shader/src/lib.rs b/rust-gpu/crates/shader/src/lib.rs index cbdbad3..a28ee21 100644 --- a/rust-gpu/crates/shader/src/lib.rs +++ b/rust-gpu/crates/shader/src/lib.rs @@ -475,12 +475,14 @@ pub fn collatz(mut n: u32) -> Option { Some(i) } -// LocalSize/numthreads of (x = 64, y = 1, z = 1) #[spirv(compute(threads(64)))] pub fn compute_primes( #[spirv(global_invocation_id)] id: UVec3, - #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] prime_indices: &mut [u32], + #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] prime_indices: &mut [Vec4], ) { let index = id.x as usize; - prime_indices[index] = collatz(prime_indices[index]).unwrap_or(u32::MAX); + prime_indices[index].x = 1.0; + prime_indices[index].y = 1.0; + prime_indices[index].z = 0.0; + prime_indices[index].z = 1.0; } From b426e77c255c2f3e22e2534e36c003a0135ed515 Mon Sep 17 00:00:00 2001 From: Filipp Samoilov Date: Sun, 11 Jun 2023 19:27:20 +0300 Subject: [PATCH 8/8] Fix invocation indices --- bevy-app/crates/viewer/examples/compute.rs | 6 +++-- rust-gpu/crates/shader/src/lib.rs | 26 +++++++++++++++------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/bevy-app/crates/viewer/examples/compute.rs b/bevy-app/crates/viewer/examples/compute.rs index c153736..fb34341 100644 --- a/bevy-app/crates/viewer/examples/compute.rs +++ b/bevy-app/crates/viewer/examples/compute.rs @@ -150,9 +150,11 @@ impl FromWorld for GameOfLifePipeline { count: None, }], }); + let shader = world .resource::() .load("rust-gpu/shader.rust-gpu.msgpack"); + // let shader = world // .resource::() // .load("gol.wgsl"); @@ -163,7 +165,7 @@ impl FromWorld for GameOfLifePipeline { push_constant_ranges: Vec::new(), shader: shader.clone(), shader_defs: vec![], - entry_point: Cow::from("compute_primes"), + entry_point: Cow::from("init"), }); let update_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { label: Some("update_compute_primes".into()), @@ -171,7 +173,7 @@ impl FromWorld for GameOfLifePipeline { push_constant_ranges: Vec::new(), shader, shader_defs: vec![], - entry_point: Cow::from("compute_primes"), + entry_point: Cow::from("update"), }); GameOfLifePipeline { diff --git a/rust-gpu/crates/shader/src/lib.rs b/rust-gpu/crates/shader/src/lib.rs index a28ee21..f5456e4 100644 --- a/rust-gpu/crates/shader/src/lib.rs +++ b/rust-gpu/crates/shader/src/lib.rs @@ -29,7 +29,7 @@ use rust_gpu_sdf::{ }; use spirv_std::{ arch::{ddx, ddy}, - glam::{Mat3, UVec3, Vec2, Vec3, Vec4, Vec4Swizzles}, + glam::{IVec4, Mat3, UVec3, Vec2, Vec3, Vec4, Vec4Swizzles}, spirv, }; @@ -476,13 +476,23 @@ pub fn collatz(mut n: u32) -> Option { } #[spirv(compute(threads(64)))] -pub fn compute_primes( +pub fn init( #[spirv(global_invocation_id)] id: UVec3, - #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] prime_indices: &mut [Vec4], + #[spirv(num_workgroups)] num: UVec3, + #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] texture: &mut [Vec4], ) { - let index = id.x as usize; - prime_indices[index].x = 1.0; - prime_indices[index].y = 1.0; - prime_indices[index].z = 0.0; - prime_indices[index].z = 1.0; + let index = (id.y * num.x) as usize + id.y as usize; + texture[index] = Vec4::new(1.0, 0.2, 0.3, 0.4); +} + +#[spirv(compute(threads(64)))] +pub fn update( + #[spirv(global_invocation_id)] id: UVec3, + #[spirv(num_workgroups)] num: UVec3, + #[spirv(storage_buffer, descriptor_set = 0, binding = 0)] texture: &mut [Vec4], +) { + let index = (id.y * num.x) as usize + id.y as usize; + let pixel = &mut texture[index]; + + pixel.x = (pixel.x + 0.01).fract(); }