Skip to content

Commit c320599

Browse files
bors[bot]kunalmohan
bors[bot]
and
kunalmohan
authored
[rs] Merge gfx-rs#492
492: Replace NonZeroU32 with u32 in TextureViewDescriptor r=kvark a=kunalmohan Includes gfx-rs#854 (rustfmt seems to have introduced a number of other changes. I can revert them if they are undesired) r?@kvark Co-authored-by: Kunal Mohan <[email protected]>
2 parents 45df7b0 + eba4cd9 commit c320599

File tree

5 files changed

+47
-58
lines changed

5 files changed

+47
-58
lines changed

‎wgpu/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ vulkan-portability = ["wgc/gfx-backend-vulkan"]
2727
package = "wgpu-core"
2828
version = "0.5"
2929
git = "https://github.com/gfx-rs/wgpu"
30-
rev = "9929b8719ff9c15a96adbf279fcbf3e943f23c78"
30+
rev = "9e4839eb049707629fa8a91e3603085433f352a4"
3131
features = ["raw-window-handle"]
3232

3333
[dependencies.wgt]
3434
package = "wgpu-types"
3535
version = "0.5"
3636
git = "https://github.com/gfx-rs/wgpu"
37-
rev = "9929b8719ff9c15a96adbf279fcbf3e943f23c78"
37+
rev = "9e4839eb049707629fa8a91e3603085433f352a4"
3838

3939
[dependencies]
4040
arrayvec = "0.5"

‎wgpu/examples/mipmap/main.rs

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
mod framework;
33

44
use bytemuck::{Pod, Zeroable};
5-
use std::{borrow::Cow::Borrowed, num::NonZeroU32};
5+
use std::borrow::Cow::Borrowed;
66
use wgpu::util::DeviceExt;
77

88
const TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8UnormSrgb;
@@ -160,7 +160,7 @@ impl Example {
160160
dimension: wgpu::TextureViewDimension::D2,
161161
aspect: wgpu::TextureAspect::All,
162162
base_mip_level: mip,
163-
level_count: NonZeroU32::new(1),
163+
level_count: Some(1),
164164
base_array_layer: 0,
165165
array_layer_count: None,
166166
})
@@ -215,13 +215,11 @@ impl framework::Example for Example {
215215
// Create the vertex and index buffers
216216
let vertex_size = mem::size_of::<Vertex>();
217217
let vertex_data = create_vertices();
218-
let vertex_buf = device.create_buffer_init(
219-
&wgpu::util::BufferInitDescriptor {
220-
label: Some("Vertex Buffer"),
221-
contents: bytemuck::cast_slice(&vertex_data),
222-
usage: wgpu::BufferUsage::VERTEX,
223-
}
224-
);
218+
let vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
219+
label: Some("Vertex Buffer"),
220+
contents: bytemuck::cast_slice(&vertex_data),
221+
usage: wgpu::BufferUsage::VERTEX,
222+
});
225223

226224
// Create pipeline layout
227225
let bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor {
@@ -279,13 +277,11 @@ impl framework::Example for Example {
279277
let texture_view = texture.create_default_view();
280278
//Note: we could use queue.write_texture instead, and this is what other
281279
// examples do, but here we want to show another way to do this.
282-
let temp_buf = device.create_buffer_init(
283-
&wgpu::util::BufferInitDescriptor {
284-
label: Some("Temporary Buffer"),
285-
contents: texels.as_slice(),
286-
usage: wgpu::BufferUsage::COPY_SRC,
287-
}
288-
);
280+
let temp_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
281+
label: Some("Temporary Buffer"),
282+
contents: texels.as_slice(),
283+
usage: wgpu::BufferUsage::COPY_SRC,
284+
});
289285
init_encoder.copy_buffer_to_texture(
290286
wgpu::BufferCopyView {
291287
buffer: &temp_buf,
@@ -316,13 +312,11 @@ impl framework::Example for Example {
316312
});
317313
let mx_total = Self::generate_matrix(sc_desc.width as f32 / sc_desc.height as f32);
318314
let mx_ref: &[f32; 16] = mx_total.as_ref();
319-
let uniform_buf = device.create_buffer_init(
320-
&wgpu::util::BufferInitDescriptor {
321-
label: Some("Uniform Buffer"),
322-
contents: bytemuck::cast_slice(mx_ref),
323-
usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
324-
}
325-
);
315+
let uniform_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
316+
label: Some("Uniform Buffer"),
317+
contents: bytemuck::cast_slice(mx_ref),
318+
usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
319+
});
326320

327321
// Create bind group
328322
let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {

‎wgpu/examples/shadow/main.rs

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{borrow::Cow::Borrowed, iter, mem, num::NonZeroU32, ops::Range, rc::Rc};
1+
use std::{borrow::Cow::Borrowed, iter, mem, ops::Range, rc::Rc};
22

33
#[path = "../framework.rs"]
44
mod framework;
@@ -221,33 +221,29 @@ impl framework::Example for Example {
221221
label: Some("Cubes Vertex Buffer"),
222222
contents: bytemuck::cast_slice(&cube_vertex_data),
223223
usage: wgpu::BufferUsage::VERTEX,
224-
}
224+
},
225225
));
226226

227227
let cube_index_buf = Rc::new(device.create_buffer_init(
228228
&wgpu::util::BufferInitDescriptor {
229229
label: Some("Cubes Index Buffer"),
230230
contents: bytemuck::cast_slice(&cube_index_data),
231231
usage: wgpu::BufferUsage::INDEX,
232-
}
232+
},
233233
));
234234

235235
let (plane_vertex_data, plane_index_data) = create_plane(7);
236-
let plane_vertex_buf = device.create_buffer_init(
237-
&wgpu::util::BufferInitDescriptor {
238-
label: Some("Plane Vertex Buffer"),
239-
contents: bytemuck::cast_slice(&plane_vertex_data),
240-
usage: wgpu::BufferUsage::VERTEX,
241-
}
242-
);
236+
let plane_vertex_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
237+
label: Some("Plane Vertex Buffer"),
238+
contents: bytemuck::cast_slice(&plane_vertex_data),
239+
usage: wgpu::BufferUsage::VERTEX,
240+
});
243241

244-
let plane_index_buf = device.create_buffer_init(
245-
&wgpu::util::BufferInitDescriptor {
246-
label: Some("Plane Index Buffer"),
247-
contents: bytemuck::cast_slice(&plane_index_data),
248-
usage: wgpu::BufferUsage::INDEX,
249-
}
250-
);
242+
let plane_index_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
243+
label: Some("Plane Index Buffer"),
244+
contents: bytemuck::cast_slice(&plane_index_data),
245+
usage: wgpu::BufferUsage::INDEX,
246+
});
251247

252248
let entity_uniform_size = mem::size_of::<EntityUniforms>() as wgpu::BufferAddress;
253249
let plane_uniform_buf = device.create_buffer(&wgpu::BufferDescriptor {
@@ -395,7 +391,7 @@ impl framework::Example for Example {
395391
base_mip_level: 0,
396392
level_count: None,
397393
base_array_layer: i as u32,
398-
array_layer_count: NonZeroU32::new(1),
394+
array_layer_count: Some(1),
399395
}))
400396
})
401397
.collect::<Vec<_>>();
@@ -581,13 +577,11 @@ impl framework::Example for Example {
581577
proj: *mx_total.as_ref(),
582578
num_lights: [lights.len() as u32, 0, 0, 0],
583579
};
584-
let uniform_buf = device.create_buffer_init(
585-
&wgpu::util::BufferInitDescriptor {
586-
label: Some("Uniform Buffer"),
587-
contents: bytemuck::bytes_of( &forward_uniforms),
588-
usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
589-
}
590-
);
580+
let uniform_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
581+
label: Some("Uniform Buffer"),
582+
contents: bytemuck::bytes_of(&forward_uniforms),
583+
usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
584+
});
591585

592586
// Create bind group
593587
let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {

‎wgpu/src/backend/direct.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ use futures::future::{ready, Ready};
1010
use smallvec::SmallVec;
1111
use std::{
1212
borrow::Cow::{self, Borrowed},
13+
error::Error,
1314
ffi::CString,
14-
fmt,
15-
marker::PhantomData,
16-
ops::Range,
17-
ptr,
18-
slice,
19-
error::Error
15+
fmt,
16+
marker::PhantomData,
17+
ops::Range,
18+
ptr, slice,
2019
};
2120
use typed_arena::Arena;
2221

@@ -837,6 +836,7 @@ impl crate::Context for Context {
837836
},
838837
PhantomData
839838
))
839+
.unwrap_pretty()
840840
}
841841

842842
fn device_create_render_bundle_encoder(

‎wgpu/src/backend/web.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ fn map_texture_format(texture_format: wgt::TextureFormat) -> web_sys::GpuTexture
307307
TextureFormat::Depth32Float => tf::Depth32float,
308308
TextureFormat::Depth24Plus => tf::Depth24plus,
309309
TextureFormat::Depth24PlusStencil8 => tf::Depth24plusStencil8,
310+
_ => unimplemented!(),
310311
}
311312
}
312313

@@ -1201,11 +1202,11 @@ impl crate::Context for Context {
12011202
mapped_desc.aspect(map_texture_aspect(d.aspect));
12021203
mapped_desc.base_array_layer(d.base_array_layer);
12031204
if let Some(count) = d.array_layer_count {
1204-
mapped_desc.array_layer_count(count.get());
1205+
mapped_desc.array_layer_count(count);
12051206
}
12061207
mapped_desc.base_mip_level(d.base_mip_level);
12071208
if let Some(count) = d.level_count {
1208-
mapped_desc.mip_level_count(count.get());
1209+
mapped_desc.mip_level_count(count);
12091210
}
12101211
// TODO: label
12111212
texture.0.create_view_with_descriptor(&mapped_desc)

0 commit comments

Comments
 (0)