nordic-dev.net/vulkano
nordic-dev.net/vulkano
2
0
Fork 0
mirror of https://github.com/vulkano-rs/vulkano.git synced 2024-11-25 08:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong image dimensions being checked when copying from buffer (#728)

Browse Source
This commit is contained in:
tomaka 2017-08-06 20:46:12 +02:00 committed by GitHub
parent b47335cbd5
commit ae51cd154f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vulkano/src/command_buffer/validity/copy_image_buffer.rs
View File

@ -99,8 +99,15 @@ pub fn check_copy_buffer_image<B, I, P>(device: &Device, buffer: &B, image: &I,
image.format().ensure_accepts()?;
if image_dimensions.num_texels() as usize * image.format().rate() as usize > buffer.len() {
return Err(CheckCopyBufferImageError::BufferTooSmall);
{
let num_texels = image_size[0] * image_size[1] * image_size[2] * image_num_layers;
let required_len = num_texels as usize * image.format().rate() as usize;
if required_len > buffer.len() {
return Err(CheckCopyBufferImageError::BufferTooSmall {
required_len: required_len,
actual_len: buffer.len(),
});
}
}
// TODO: check memory overlap?
@ -124,7 +131,12 @@ pub enum CheckCopyBufferImageError {
/// The type of pixels in the buffer isn't compatible with the image format.
WrongPixelType(IncompatiblePixelsType),
/// The buffer is too small for the copy operation.
BufferTooSmall,
BufferTooSmall {
/// Required number of elements in the buffer.
required_len: usize,
/// Actual number of elements in the buffer.
actual_len: usize,
},
}
impl error::Error for CheckCopyBufferImageError {
@ -149,7 +161,7 @@ impl error::Error for CheckCopyBufferImageError {
CheckCopyBufferImageError::WrongPixelType(_) => {
"the type of pixels in the buffer isn't compatible with the image format"
},
CheckCopyBufferImageError::BufferTooSmall => {
CheckCopyBufferImageError::BufferTooSmall { .. } => {
"the buffer is too small for the copy operation"
},
}