Skip to content

Commit

Permalink
Check for empty aspects when creating ImageView (#2028)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rua authored Oct 8, 2022
1 parent 3c6c1c9 commit 8409173
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions vulkano/src/image/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,18 @@ where
let device = image_inner.device();
let format = format.unwrap();

let level_count = subresource_range.mip_levels.end - subresource_range.mip_levels.start;
let layer_count = subresource_range.array_layers.end - subresource_range.array_layers.start;

// VUID-VkImageSubresourceRange-aspectMask-requiredbitmask
assert!(!subresource_range.aspects.is_empty());

// VUID-VkImageSubresourceRange-levelCount-01720
assert!(level_count != 0);

// VUID-VkImageSubresourceRange-layerCount-01721
assert!(layer_count != 0);

let default_usage = Self::get_default_usage(subresource_range.aspects, image_inner);

let has_non_default_usage = if usage.is_empty() {
Expand All @@ -111,12 +123,6 @@ where
usage == default_usage
};

let level_count = subresource_range.mip_levels.end - subresource_range.mip_levels.start;
let layer_count = subresource_range.array_layers.end - subresource_range.array_layers.start;

assert!(level_count != 0);
assert!(layer_count != 0);

// VUID-VkImageViewCreateInfo-viewType-parameter
view_type.validate_device(device)?;

Expand Down

0 comments on commit 8409173

Please sign in to comment.