From 5f6accc206b6bbefd246973bd99f7605669035ce Mon Sep 17 00:00:00 2001 From: Aron Granberg Date: Tue, 14 Apr 2020 20:15:53 +0200 Subject: [PATCH] Improve error messages when passing buffers with the wrong usage flags --- wgpu-core/src/command/render.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wgpu-core/src/command/render.rs b/wgpu-core/src/command/render.rs index a0e3694df9..46607be869 100644 --- a/wgpu-core/src/command/render.rs +++ b/wgpu-core/src/command/render.rs @@ -979,7 +979,7 @@ impl Global { .buffers .use_extend(&*buffer_guard, buffer_id, (), BufferUsage::INDEX) .unwrap(); - assert!(buffer.usage.contains(BufferUsage::INDEX)); + assert!(buffer.usage.contains(BufferUsage::INDEX), "An invalid setIndexBuffer call has been made. The buffer usage is {:?} which does not contain required usage INDEX", buffer.usage); let end = if size != 0 { offset + size @@ -1012,7 +1012,7 @@ impl Global { .buffers .use_extend(&*buffer_guard, buffer_id, (), BufferUsage::VERTEX) .unwrap(); - assert!(buffer.usage.contains(BufferUsage::VERTEX)); + assert!(buffer.usage.contains(BufferUsage::VERTEX), "An invalid setVertexBuffer call has been made. The buffer usage is {:?} which does not contain required usage VERTEX", buffer.usage); let empty_slots = (1 + slot as usize).saturating_sub(state.vertex.inputs.len()); state .vertex @@ -1136,7 +1136,7 @@ impl Global { .buffers .use_extend(&*buffer_guard, buffer_id, (), BufferUsage::INDIRECT) .unwrap(); - assert!(buffer.usage.contains(BufferUsage::INDIRECT)); + assert!(buffer.usage.contains(BufferUsage::INDIRECT), "An invalid drawIndirect call has been made. The buffer usage is {:?} which does not contain required usage INDIRECT", buffer.usage); unsafe { raw.draw_indirect(&buffer.raw, offset, 1, 0); @@ -1149,7 +1149,7 @@ impl Global { .buffers .use_extend(&*buffer_guard, buffer_id, (), BufferUsage::INDIRECT) .unwrap(); - assert!(buffer.usage.contains(BufferUsage::INDIRECT)); + assert!(buffer.usage.contains(BufferUsage::INDIRECT), "An invalid drawIndexedIndirect call has been made. The buffer usage is {:?} which does not contain required usage INDIRECT", buffer.usage); unsafe { raw.draw_indexed_indirect(&buffer.raw, offset, 1, 0);