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

migrated tutorials 1 and 2

Browse Source
pull/140/head
Ben Hansen 3 years ago
parent c1b60c0d38
commit 47fd27669e
60 changed files with 612 additions and 206 deletions
Show Stats Download Patch File Download Diff File

589
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
code/beginner/tutorial1-window/Cargo.toml
Unescape Escape View File

@ -18,5 +18,5 @@ shaderc = "0.7"
cgmath = "0.17"
env_logger = "0.7"
log = "0.4"
wgpu = "0.6"
wgpu = "0.7"
futures = "0.3"

2
code/beginner/tutorial2-swapchain/Cargo.toml
Unescape Escape View File

@ -13,7 +13,7 @@ shaderc = "0.7"
cgmath = "0.17"
env_logger = "0.7"
log = "0.4"
wgpu = "0.6"
wgpu = "0.7"
futures = "0.3"

7
code/beginner/tutorial2-swapchain/src/challenge.rs
Unescape Escape View File

@ -26,7 +26,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -35,9 +35,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -45,7 +45,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -103,6 +103,7 @@ impl State {
{
let _render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

7
code/beginner/tutorial2-swapchain/src/main.rs
Unescape Escape View File

@ -25,7 +25,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -34,9 +34,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -44,7 +44,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -87,6 +87,7 @@ impl State {
{
let _render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

2
code/beginner/tutorial3-pipeline/Cargo.toml
Unescape Escape View File

@ -11,7 +11,7 @@ winit = "0.22"
cgmath = "0.17"
env_logger = "0.7"
log = "0.4"
wgpu = "0.6"
wgpu = "0.7"
futures = "0.3"
# NEW!

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

@ -28,7 +28,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -37,9 +37,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -47,7 +47,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -98,7 +98,6 @@ impl State {
},
sample_count: 1,
sample_mask: !0,
alpha_to_coverage_enabled: false,
});
let vs_module = device.create_shader_module(wgpu::include_spirv!("challenge.vert.spv"));
@ -194,6 +193,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

7
code/beginner/tutorial3-pipeline/src/main.rs
Unescape Escape View File

@ -27,7 +27,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -36,9 +36,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -46,7 +46,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -136,6 +136,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

2
code/beginner/tutorial4-buffer/Cargo.toml
Unescape Escape View File

@ -9,7 +9,7 @@ edition = "2018"
image = "0.23"
winit = "0.22"
cgmath = "0.17"
wgpu = "0.6"
wgpu = "0.7"
env_logger = "0.7"
log = "0.4"
futures = "0.3"

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

@ -91,7 +91,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -100,9 +100,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -110,7 +110,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -265,6 +265,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

7
code/beginner/tutorial4-buffer/src/main.rs
Unescape Escape View File

@ -84,7 +84,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -93,9 +93,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -103,7 +103,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -208,6 +208,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

2
code/beginner/tutorial5-textures/Cargo.toml
Unescape Escape View File

@ -14,7 +14,7 @@ env_logger = "0.7"
log = "0.4"
futures = "0.3"
image = "0.23"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

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

@ -93,7 +93,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -101,9 +101,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -111,7 +111,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -296,6 +296,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

7
code/beginner/tutorial5-textures/src/main.rs
Unescape Escape View File

@ -90,7 +90,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -98,9 +98,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -108,7 +108,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -257,6 +257,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

2
code/beginner/tutorial6-uniforms/Cargo.toml
Unescape Escape View File

@ -12,7 +12,7 @@ env_logger = "0.7"
log = "0.4"
futures = "0.3"
image = "0.23"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

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

@ -255,7 +255,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -263,9 +263,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -273,7 +273,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -482,6 +482,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

7
code/beginner/tutorial6-uniforms/src/main.rs
Unescape Escape View File

@ -240,7 +240,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -248,9 +248,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -258,7 +258,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -464,6 +464,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

2
code/beginner/tutorial7-instancing/Cargo.toml
Unescape Escape View File

@ -12,7 +12,7 @@ env_logger = "0.7"
log = "0.4"
futures = "0.3"
image = "0.23"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

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

@ -337,7 +337,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -345,9 +345,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -355,7 +355,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -614,6 +614,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

7
code/beginner/tutorial7-instancing/src/main.rs
Unescape Escape View File

@ -301,7 +301,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -309,9 +309,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -319,7 +319,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,
@ -564,6 +564,7 @@ impl State {
{
let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor {
label: Some("Render Pass"),
color_attachments: &[wgpu::RenderPassColorAttachmentDescriptor {
attachment: &frame.view,
resolve_target: None,

2
code/beginner/tutorial8-depth/Cargo.toml
Unescape Escape View File

@ -12,7 +12,7 @@ env_logger = "0.7"
futures = "0.3"
image = "0.23"
log = "0.4"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

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

@ -488,7 +488,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -496,9 +496,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -506,7 +506,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

6
code/beginner/tutorial8-depth/src/main.rs
Unescape Escape View File

@ -311,7 +311,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -319,9 +319,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -329,7 +329,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

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

@ -27,7 +27,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

2
code/beginner/tutorial9-models/Cargo.toml
Unescape Escape View File

@ -13,7 +13,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

6
code/beginner/tutorial9-models/src/main.rs
Unescape Escape View File

@ -249,7 +249,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -257,9 +257,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -267,7 +267,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

2
code/beginner/tutorial9-models/src/texture.rs
Unescape Escape View File

@ -41,7 +41,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

2
code/intermediate/tutorial10-lighting/Cargo.toml
Unescape Escape View File

@ -13,7 +13,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

6
code/intermediate/tutorial10-lighting/src/main.rs
Unescape Escape View File

@ -324,7 +324,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -332,9 +332,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -342,7 +342,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

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

@ -41,7 +41,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

2
code/intermediate/tutorial11-normals/Cargo.toml
Unescape Escape View File

@ -13,7 +13,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

6
code/intermediate/tutorial11-normals/src/main.rs
Unescape Escape View File

@ -321,7 +321,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -329,9 +329,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -339,7 +339,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

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

@ -42,7 +42,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

2
code/intermediate/tutorial12-camera/Cargo.toml
Unescape Escape View File

@ -13,7 +13,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.23"
[build-dependencies]

6
code/intermediate/tutorial12-camera/src/main.rs
Unescape Escape View File

@ -202,7 +202,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -210,9 +210,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -220,7 +220,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

2
code/intermediate/tutorial12-camera/src/texture.rs
Unescape Escape View File

@ -42,7 +42,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

2
code/intermediate/tutorial13-threading/Cargo.toml
Unescape Escape View File

@ -14,7 +14,7 @@ image = "0.23"
log = "0.4"
rayon = "1.4" # NEW!
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.23"
[build-dependencies]

6
code/intermediate/tutorial13-threading/src/main.rs
Unescape Escape View File

@ -202,7 +202,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -210,9 +210,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -220,7 +220,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

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

@ -42,7 +42,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

4
code/research/performance/src/main.rs
Unescape Escape View File

@ -227,7 +227,7 @@ impl State {
let adapter = wgpu::Adapter::request(
&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
},
wgpu::BackendBit::PRIMARY, // Vulkan + Metal + DX12 + Browser WebGPU
@ -245,7 +245,7 @@ impl State {
.await;
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

4
code/research/performance/src/texture.rs
Unescape Escape View File

@ -46,7 +46,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT
usage: wgpu::TextureUsage::RENDER_ATTACHMENT
| wgpu::TextureUsage::SAMPLED
| wgpu::TextureUsage::COPY_SRC,
};
@ -123,7 +123,7 @@ impl Texture {
usage: wgpu::TextureUsage::SAMPLED
| wgpu::TextureUsage::COPY_DST
// Needed for to make the mip maps.
| wgpu::TextureUsage::OUTPUT_ATTACHMENT,
| wgpu::TextureUsage::RENDER_ATTACHMENT,
};
let texture = device.create_texture(&texture_desc);

2
code/showcase/compute/Cargo.toml
Unescape Escape View File

@ -14,7 +14,7 @@ image = "0.23"
log = "0.4"
rayon = "1.4"
tobj = "2.0"
wgpu = { version = "0.6", features = ["trace"] }
wgpu = { version = "0.7", features = ["trace"] }
winit = "0.22"
[build-dependencies]

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

@ -150,7 +150,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -159,9 +159,9 @@ impl State {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
Some(&path), // Trace path
)
@ -169,7 +169,7 @@ impl State {
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

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

@ -42,7 +42,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT | wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);
let view = texture.create_view(&wgpu::TextureViewDescriptor::default());

2
code/showcase/framework/Cargo.toml
Unescape Escape View File

@ -14,7 +14,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
wgpu-subscriber = "0.1"
winit = "0.23"

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

@ -39,7 +39,7 @@ impl Display {
let surface = unsafe { instance.create_surface(&window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -47,16 +47,16 @@ impl Display {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None,
)
.await
.unwrap();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

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

@ -145,7 +145,7 @@ impl<'a> Texture<'a> {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
};
Self::from_descriptor(device, desc)
}

2
code/showcase/gifs/Cargo.toml
Unescape Escape View File

@ -14,7 +14,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
gif = "0.10.3"

2
code/showcase/gifs/src/main.rs
Unescape Escape View File

@ -44,7 +44,7 @@ async fn run() {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Rgba8UnormSrgb,
usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::RENDER_ATTACHMENT,
label: None,
};
let render_target = framework::Texture::from_descriptor(&device, rt_desc);

2
code/showcase/imgui-demo/Cargo.toml
Unescape Escape View File

@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
anyhow = "1.0"
wgpu = "0.6"
wgpu = "0.7"
futures = "0.3"
imgui = "0.6"
imgui-wgpu = "0.12"

2
code/showcase/instancing/Cargo.toml
Unescape Escape View File

@ -13,7 +13,7 @@ futures = "0.3"
image = "0.23"
log = "0.4"
tobj = "2.0"
wgpu = "0.6"
wgpu = "0.7"
winit = "0.22"
[build-dependencies]

2
code/showcase/pong/Cargo.toml
Unescape Escape View File

@ -11,7 +11,7 @@ anyhow = "1.0"
bytemuck = { version = "1.4", features = [ "derive" ] }
cgmath = "0.17"
futures = "0.3"
wgpu = "0.6"
wgpu = "0.7"
wgpu_glyph = "0.10"
rand = "0.7"
rodio = "0.11"

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

@ -45,7 +45,7 @@ impl Render {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance
.request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
})
.await
@ -53,9 +53,9 @@ impl Render {
let (device, queue) = adapter
.request_device(
&wgpu::DeviceDescriptor {
label: None,
features: wgpu::Features::empty(),
limits: wgpu::Limits::default(),
shader_validation: true,
},
None, // Trace path
)
@ -64,7 +64,7 @@ impl Render {
let size = video_mode.size();
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

4
code/showcase/windowless/src/main.rs
Unescape Escape View File

@ -1,7 +1,7 @@
async fn run() {
let adapter = wgpu::Adapter::request(
&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: None,
},
wgpu::BackendBit::PRIMARY,
@ -22,7 +22,7 @@ async fn run() {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Rgba8UnormSrgb,
usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::COPY_SRC | wgpu::TextureUsage::RENDER_ATTACHMENT,
label: None,
};
let texture = device.create_texture(&texture_desc);

2
docs/beginner/tutorial1-window/README.md
Unescape Escape View File

@ -14,7 +14,7 @@ shaderc = "0.7"
cgmath = "0.17"
env_logger = "0.7"
log = "0.4"
wgpu = "0.6"
wgpu = "0.7"
futures = "0.3"
```

4
docs/beginner/tutorial2-swapchain/README.md
Unescape Escape View File

@ -55,7 +55,7 @@ impl State {
let surface = unsafe { instance.create_surface(window) };
let adapter = instance.request_adapter(
&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: Some(&surface),
},
).await.unwrap();
@ -92,7 +92,7 @@ The `limits` field describes the limit of certain types of resource we can creat
```rust
let sc_desc = wgpu::SwapChainDescriptor {
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT,
usage: wgpu::TextureUsage::RENDER_ATTACHMENT,
format: wgpu::TextureFormat::Bgra8UnormSrgb,
width: size.width,
height: size.height,

2
docs/beginner/tutorial3-pipeline/README.md
Unescape Escape View File

@ -279,7 +279,7 @@ image = "0.23"
winit = "0.22"
# shaderc = "0.7" # REMOVED!
cgmath = "0.17"
wgpu = "0.6"
wgpu = "0.7"
futures = "0.3"
# NEW!

2
docs/beginner/tutorial8-depth/README.md
Unescape Escape View File

@ -39,7 +39,7 @@ impl Texture {
sample_count: 1,
dimension: wgpu::TextureDimension::D2,
format: Self::DEPTH_FORMAT,
usage: wgpu::TextureUsage::OUTPUT_ATTACHMENT // 3.
usage: wgpu::TextureUsage::RENDER_ATTACHMENT // 3.
| wgpu::TextureUsage::SAMPLED,
};
let texture = device.create_texture(&desc);

2
docs/showcase/gifs/README.md
Unescape Escape View File

@ -61,7 +61,7 @@ let rt_desc = wgpu::TextureDescriptor {
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Rgba8UnormSrgb,
usage: wgpu::TextureUsage::COPY_SRC
| wgpu::TextureUsage::OUTPUT_ATTACHMENT,
| wgpu::TextureUsage::RENDER_ATTACHMENT,
label: None,
};
let render_target = framework::Texture::from_descriptor(&device, rt_desc);

4
docs/showcase/windowless/README.md
Unescape Escape View File

@ -9,7 +9,7 @@ It's actually quite simple. We don't *need* a window to create an `Instance`, we
```rust
let adapter = wgpu::Adapter::request(
&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
power_preference: wgpu::PowerPreference::default(),
compatible_surface: None,
},
wgpu::BackendBit::PRIMARY,
@ -36,7 +36,7 @@ let texture_desc = wgpu::TextureDescriptor {
dimension: wgpu::TextureDimension::D2,
format: wgpu::TextureFormat::Rgba8UnormSrgb,
usage: wgpu::TextureUsage::COPY_SRC
| wgpu::TextureUsage::OUTPUT_ATTACHMENT
| wgpu::TextureUsage::RENDER_ATTACHMENT
,
label: None,
};

Write Preview
Loading…
Cancel
Save