diff --git a/wgpu-core/src/command/compute.rs b/wgpu-core/src/command/compute.rs index 4037bc1f3d..8ffff41aa5 100644 --- a/wgpu-core/src/command/compute.rs +++ b/wgpu-core/src/command/compute.rs @@ -117,7 +117,7 @@ pub struct ComputePassDescriptor<'a> { pub enum DispatchError { #[error("compute pipeline must be set")] MissingPipeline, - #[error("current compute pipeline has a layout which is incompatible with a currently set bind group, first differing at entry index {index}")] + #[error("the pipeline layout, associated with the current compute pipeline, contains a bind group layout at index {index} which is incompatible with the bind group layout associated with the bind group at {index}")] IncompatibleBindGroup { index: u32, //expected: BindGroupLayoutId, diff --git a/wgpu-core/src/command/draw.rs b/wgpu-core/src/command/draw.rs index b70a4de92e..e8e53e3ade 100644 --- a/wgpu-core/src/command/draw.rs +++ b/wgpu-core/src/command/draw.rs @@ -26,7 +26,7 @@ pub enum DrawError { MissingVertexBuffer { index: u32 }, #[error("index buffer must be set")] MissingIndexBuffer, - #[error("current render pipeline has a layout which is incompatible with a currently set bind group, first differing at entry index {index}")] + #[error("the pipeline layout, associated with the current render pipeline, contains a bind group layout at index {index} which is incompatible with the bind group layout associated with the bind group at {index}")] IncompatibleBindGroup { index: u32, //expected: BindGroupLayoutId, diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs index 9ab1e5e9ad..99d994d60b 100644 --- a/wgpu-core/src/device/mod.rs +++ b/wgpu-core/src/device/mod.rs @@ -76,21 +76,23 @@ pub(crate) struct RenderPassContext { } #[derive(Clone, Debug, Error)] pub enum RenderPassCompatibilityError { - #[error("Incompatible color attachment: {0:?} != {1:?}")] + #[error("Incompatible color attachment: the renderpass expected {0:?} but was given {1:?}")] IncompatibleColorAttachment( ArrayVec, ArrayVec, ), - #[error("Incompatible depth-stencil attachment: {0:?} != {1:?}")] + #[error( + "Incompatible depth-stencil attachment: the renderpass expected {0:?} but was given {1:?}" + )] IncompatibleDepthStencilAttachment(Option, Option), - #[error("Incompatible sample count: {0:?} != {1:?}")] + #[error("Incompatible sample count: the renderpass expected {0:?} but was given {1:?}")] IncompatibleSampleCount(u32, u32), - #[error("Incompatible multiview: {0:?} != {1:?}")] + #[error("Incompatible multiview: the renderpass expected {0:?} but was given {1:?}")] IncompatibleMultiview(Option, Option), } impl RenderPassContext { - // Assumed the renderpass only contains one subpass + // Assumes the renderpass only contains one subpass pub(crate) fn check_compatible( &self, other: &Self,