archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix invalid mip level count check

Browse Source
This commit is contained in:
Ben Frankel 2020-09-07 16:49:06 -07:00
parent 68bf10a3a5
commit 2ee07a2a47
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,7 +515,10 @@ impl<B: GfxBackend> Device<B> {
let usage = conv::map_texture_usage(desc.usage, aspects); let usage = conv::map_texture_usage(desc.usage, aspects);
let mip_level_count = desc.mip_level_count; let mip_level_count = desc.mip_level_count;
if mip_level_count == 0 && mip_level_count > kind.compute_num_levels() as u32 { if mip_level_count == 0
|| mip_level_count > MAX_MIP_LEVELS
|| mip_level_count > kind.compute_num_levels() as u32
{
return Err(resource::CreateTextureError::InvalidMipLevelCount( return Err(resource::CreateTextureError::InvalidMipLevelCount(
mip_level_count, mip_level_count,
)); ));

2
wgpu-core/src/resource.rs
View File

@ -239,7 +239,7 @@ pub enum CreateTextureError {
CannotCopyD24Plus, CannotCopyD24Plus,
#[error(transparent)] #[error(transparent)]
InvalidDimension(#[from] TextureDimensionError), InvalidDimension(#[from] TextureDimensionError),
#[error("texture descriptor mip level count ({0}) must be less than `MAX_MIP_LEVELS`")] #[error("texture descriptor mip level count ({0}) is invalid")]
InvalidMipLevelCount(u32), InvalidMipLevelCount(u32),
#[error("Feature {0:?} must be enabled to create a texture of type {1:?}")] #[error("Feature {0:?} must be enabled to create a texture of type {1:?}")]
MissingFeature(wgt::Features, wgt::TextureFormat), MissingFeature(wgt::Features, wgt::TextureFormat),