github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace NonZeroU32 with u32 in TextureViewDescriptor

Browse Source
This commit is contained in:
Kunal Mohan
2020-07-30 21:35:07 +05:30
parent 0e27959404
commit c8360152cd
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wgpu-core/src/device/mod.rs
View File

@@ -1008,32 +1008,29 @@ impl<G: GlobalIdentityHandlerFactory> Global<G> {
let (format, view_kind, range) = match desc {
Some(desc) => {
let kind = conv::map_texture_view_dimension(desc.dimension);
let required_level_count =
desc.base_mip_level + desc.level_count.map_or(1, |count| count.get());
let required_layer_count =
desc.base_array_layer + desc.array_layer_count.map_or(1, |count| count.get());
let reqd_level_count = desc.base_mip_level + desc.level_count.unwrap_or(1);
let reqd_layer_count = desc.base_array_layer + desc.array_layer_count.unwrap_or(1);
let level_end = texture.full_range.levels.end;
let layer_end = texture.full_range.layers.end;
if required_level_count > level_end as u32 {
if reqd_level_count > level_end as u32 || reqd_level_count == desc.base_mip_level {
return Err(CreateTextureViewError::InvalidMipLevelCount {
requested: required_level_count,
requested: reqd_level_count,
total: level_end,
});
}
if required_layer_count > layer_end as u32 {
if reqd_layer_count > layer_end as u32 || reqd_layer_count == desc.base_array_layer
{
return Err(CreateTextureViewError::InvalidArrayLayerCount {
requested: required_layer_count,
requested: reqd_layer_count,
total: layer_end,
});
};
let end_level = match desc.level_count {
Some(count) => (desc.base_mip_level + count.get()) as u8,
None => level_end,
};
let end_layer = match desc.array_layer_count {
Some(count) => (desc.base_array_layer + count.get()) as u16,
None => layer_end,
};
let end_level = desc
.level_count
.map_or(level_end, |_| reqd_level_count as u8);
let end_layer = desc
.array_layer_count
.map_or(layer_end, |_| reqd_layer_count as u16);
let range = hal::image::SubresourceRange {
aspects: texture.full_range.aspects,
levels: desc.base_mip_level as u8..end_level,

6
wgpu-types/src/lib.rs
View File

@@ -10,7 +10,7 @@
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use std::{borrow::Cow, num::NonZeroU32, ops::Range};
use std::{borrow::Cow, ops::Range};
pub use into_cow::IntoCow;
mod into_cow;
@@ -1493,13 +1493,13 @@ pub struct TextureViewDescriptor<L> {
/// Mip level count.
/// If `Some(count)`, `base_mip_level + count` must be less or equal to underlying texture mip count.
/// If `None`, considered to include the rest of the mipmap levels, but at least 1 in total.
pub level_count: Option<NonZeroU32>,
pub level_count: Option<u32>,
/// Base array layer.
pub base_array_layer: u32,
/// Layer count.
/// If `Some(count)`, `base_array_layer + count` must be less or equal to the underlying array count.
/// If `None`, considered to include the rest of the array layers, but at least 1 in total.
pub array_layer_count: Option<NonZeroU32>,
pub array_layer_count: Option<u32>,
}
impl<L> TextureViewDescriptor<L> {