Archives
/
learn-wgpu
mirror of https://github.com/sotrh/learn-wgpu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cargo fmt

Browse Source
0.19
Benjamin Hansen 1 month ago
parent 09c1024a8f
commit ce957226d3
37 changed files with 172 additions and 178 deletions
Show Stats Download Patch File Download Diff File

4
code/beginner/tutorial2-surface/src/challenge.rs
Unescape Escape View File

@ -28,9 +28,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial2-surface/src/lib.rs
Unescape Escape View File

@ -29,9 +29,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial3-pipeline/src/challenge.rs
Unescape Escape View File

@ -26,9 +26,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial3-pipeline/src/lib.rs
Unescape Escape View File

@ -28,9 +28,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial4-buffer/src/challenge.rs
Unescape Escape View File

@ -89,9 +89,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial4-buffer/src/lib.rs
Unescape Escape View File

@ -85,9 +85,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial5-textures/src/challenge.rs
Unescape Escape View File

@ -91,9 +91,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial5-textures/src/lib.rs
Unescape Escape View File

@ -91,9 +91,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial6-uniforms/src/challenge.rs
Unescape Escape View File

@ -241,9 +241,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial6-uniforms/src/lib.rs
Unescape Escape View File

@ -241,9 +241,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial7-instancing/src/challenge.rs
Unescape Escape View File

@ -295,9 +295,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial7-instancing/src/lib.rs
Unescape Escape View File

@ -302,9 +302,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial8-depth/src/challenge.rs
Unescape Escape View File

@ -494,9 +494,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

4
code/beginner/tutorial8-depth/src/lib.rs
Unescape Escape View File

@ -312,9 +312,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

5
code/beginner/tutorial8-depth/src/texture.rs
Unescape Escape View File

@ -15,7 +15,8 @@ impl Texture {
device: &wgpu::Device,
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {let size = wgpu::Extent3d {
) -> Self {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,
@ -58,7 +59,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

5
code/beginner/tutorial9-models/src/lib.rs
Unescape Escape View File

@ -253,9 +253,9 @@ impl<'a> State<'a> {
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
log::warn!("WGPU setup");
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -312,7 +312,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

5
code/intermediate/tutorial10-lighting/src/lib.rs
Unescape Escape View File

@ -347,9 +347,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -403,7 +403,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

2
code/intermediate/tutorial10-lighting/src/texture.rs
Unescape Escape View File

@ -15,7 +15,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

5
code/intermediate/tutorial11-normals/src/lib.rs
Unescape Escape View File

@ -347,9 +347,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -403,7 +403,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

2
code/intermediate/tutorial11-normals/src/texture.rs
Unescape Escape View File

@ -15,7 +15,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

5
code/intermediate/tutorial12-camera/src/lib.rs
Unescape Escape View File

@ -227,9 +227,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -283,7 +283,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

7
code/intermediate/tutorial13-hdr/src/lib.rs
Unescape Escape View File

@ -247,7 +247,7 @@ impl<'a> State<'a> {
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
// UPDATED
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::BROWSER_WEBGPU,
@ -300,7 +300,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[
@ -713,9 +712,7 @@ impl<'a> State<'a> {
fn render(&mut self) -> Result<(), wgpu::SurfaceError> {
let output = self.surface.get_current_texture()?;
let view = output
.texture
.create_view(&wgpu::TextureViewDescriptor {
let view = output.texture.create_view(&wgpu::TextureViewDescriptor {
format: Some(self.config.format.add_srgb_suffix()),
..Default::default()
});

7
code/intermediate/tutorial13-hdr/src/resources.rs
Unescape Escape View File

@ -287,7 +287,7 @@ impl HdrLoader {
let hdr_decoder = HdrDecoder::new(Cursor::new(data))?;
let meta = hdr_decoder.metadata();
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
let pixels = {
let mut pixels = vec![[0.0, 0.0, 0.0, 0.0]; meta.width as usize * meta.height as usize];
hdr_decoder.read_image_transform(
@ -299,8 +299,9 @@ impl HdrLoader {
)?;
pixels
};
#[cfg(target_arch="wasm32")]
let pixels = hdr_decoder.read_image_native()?
#[cfg(target_arch = "wasm32")]
let pixels = hdr_decoder
.read_image_native()?
.into_iter()
.map(|pix| {
let rgb = pix.to_hdr();

2
code/intermediate/tutorial13-hdr/src/texture.rs
Unescape Escape View File

@ -16,7 +16,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

5
code/intermediate/wip-terrain/src/lib.rs
Unescape Escape View File

@ -228,9 +228,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -284,7 +284,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

2
code/intermediate/wip-terrain/src/texture.rs
Unescape Escape View File

@ -16,7 +16,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

5
code/showcase/compute/src/main.rs
Unescape Escape View File

@ -166,9 +166,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -222,7 +222,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

2
code/showcase/compute/src/texture.rs
Unescape Escape View File

@ -30,7 +30,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

4
code/showcase/framework/src/lib.rs
Unescape Escape View File

@ -36,9 +36,9 @@ impl<'a> Display<'a> {
pub async fn new(window: &'a Window) -> Result<Display<'a>, Error> {
let size = window.inner_size();
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

5
code/showcase/mouse-picking/src/lib.rs
Unescape Escape View File

@ -232,9 +232,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -288,7 +288,6 @@ impl<'a> State<'a> {
desired_maximum_frame_latency: 2,
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

2
code/showcase/mouse-picking/src/texture.rs
Unescape Escape View File

@ -15,7 +15,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

10
code/showcase/pong/src/lib.rs
Unescape Escape View File

@ -158,7 +158,8 @@ pub fn start() {
let window = &window;
let mut last_time = instant::Instant::now();
event_loop.run(move |event, control_flow| {
event_loop
.run(move |event, control_flow| {
match event {
Event::WindowEvent {
event: WindowEvent::CloseRequested,
@ -264,7 +265,8 @@ pub fn start() {
}
_ => {}
}
}).unwrap();
})
.unwrap();
}
fn process_input(
@ -273,9 +275,7 @@ fn process_input(
control_flow: &EventLoopWindowTarget<()>,
) {
match (keycode, element_state) {
(KeyCode::Escape, ElementState::Pressed) => {
control_flow.exit()
}
(KeyCode::Escape, ElementState::Pressed) => control_flow.exit(),
_ => {}
}
}

4
code/showcase/pong/src/render/mod.rs
Unescape Escape View File

@ -41,9 +41,9 @@ impl<'a> Render<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});

5
code/showcase/threading/src/lib.rs
Unescape Escape View File

@ -226,9 +226,9 @@ impl<'a> State<'a> {
// The instance is a handle to our GPU
// BackendBit::PRIMARY => Vulkan + Metal + DX12 + Browser WebGPU
let instance = wgpu::Instance::new(wgpu::InstanceDescriptor {
#[cfg(not(target_arch="wasm32"))]
#[cfg(not(target_arch = "wasm32"))]
backends: wgpu::Backends::PRIMARY,
#[cfg(target_arch="wasm32")]
#[cfg(target_arch = "wasm32")]
backends: wgpu::Backends::GL,
..Default::default()
});
@ -282,7 +282,6 @@ impl<'a> State<'a> {
view_formats: vec![],
};
let texture_bind_group_layout =
device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
entries: &[

2
code/showcase/threading/src/texture.rs
Unescape Escape View File

@ -15,7 +15,7 @@ impl Texture {
config: &wgpu::SurfaceConfiguration,
label: &str,
) -> Self {
let size = wgpu::Extent3d {
let size = wgpu::Extent3d {
width: config.width.max(1),
height: config.height.max(1),
depth_or_array_layers: 1,

5
code/wasm-builder/src/main.rs
Unescape Escape View File

@ -1,4 +1,7 @@
use std::{path::PathBuf, process::{Command, ExitStatus}};
use std::{
path::PathBuf,
process::{Command, ExitStatus},
};
use anyhow::bail;
use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};

Write Preview
Loading…
Cancel
Save