Validate resource usage flags when used

This commit is contained in:
yanchith committed 2019-09-09 15:44:15 +02:00
1 parent 88204b9d86
commit 141f4f71eb
6 files changed
+69 -24

No files matched your search

+1
View File
@@ -205,6 +205,7 @@ pub fn compute_pass_dispatch_indirect<B: GfxBackend>(
(),
BufferUsage::INDIRECT,
);
assert!(src_buffer.usage.contains(BufferUsage::INDIRECT));
let barriers = src_pending.map(|pending| hal::memory::Barrier::Buffer {
states: pending.to_states(),
+27 -20
View File
@@ -248,20 +248,6 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
sample_count & samples_count_limit != 0,
"Attachment sample_count must be supported by physical device limits"
);
for at in color_attachments.iter() {
let sample_count_check = view_guard[at.attachment].samples;
assert_eq!(
sample_count_check, sample_count,
"All attachments must have the same sample_count"
);
if let Some(resolve) = unsafe { at.resolve_target.as_ref() } {
assert_eq!(
view_guard[*resolve].samples, 1,
"All target_resolves must have a sample_count of 1"
);
}
}
trace!(
"Encoding render pass begin in command buffer {:?}",
@@ -281,6 +267,10 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
} else {
extent = Some(view.extent);
}
let texture = &texture_guard[view.texture_id.value];
assert!(texture.usage.contains(TextureUsage::OUTPUT_ATTACHMENT));
let old_layout = match trackers
.textures
.query(view.texture_id.value, view.range.clone())
@@ -295,12 +285,13 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
None => {
// Required sub-resources have inconsistent states, we need to
// issue individual barriers instead of relying on the render pass.
let (texture, pending) = trackers.textures.use_replace(
&*texture_guard,
let pending = trackers.textures.change_replace(
view.texture_id.value,
&texture.life_guard.ref_count,
view.range.clone(),
TextureUsage::OUTPUT_ATTACHMENT,
);
barriers.extend(pending.map(|pending| {
trace!("\tdepth-stencil {:?}", pending);
hal::memory::Barrier::Image {
@@ -335,6 +326,10 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
} else {
extent = Some(view.extent);
}
assert_eq!(
view.samples, sample_count,
"All attachments must have the same sample_count"
);
if view.is_owned_by_swap_chain {
let link = match texture_guard[view.texture_id.value].placement {
@@ -348,6 +343,9 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
swap_chain_links.push(link);
}
let texture = &texture_guard[view.texture_id.value];
assert!(texture.usage.contains(TextureUsage::OUTPUT_ATTACHMENT));
let old_layout = match trackers
.textures
.query(view.texture_id.value, view.range.clone())
@@ -356,12 +354,13 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
None => {
// Required sub-resources have inconsistent states, we need to
// issue individual barriers instead of relying on the render pass.
let (texture, pending) = trackers.textures.use_replace(
&*texture_guard,
let pending = trackers.textures.change_replace(
view.texture_id.value,
&texture.life_guard.ref_count,
view.range.clone(),
TextureUsage::OUTPUT_ATTACHMENT,
);
barriers.extend(pending.map(|pending| {
trace!("\tcolor {:?}", pending);
hal::memory::Barrier::Image {
@@ -393,6 +392,10 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
} else {
extent = Some(view.extent);
}
assert_eq!(
view.samples, 1,
"All resolve_targets must have a sample_count of 1"
);
if view.is_owned_by_swap_chain {
let link = match texture_guard[view.texture_id.value].placement {
@@ -406,6 +409,9 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
swap_chain_links.push(link);
}
let texture = &texture_guard[view.texture_id.value];
assert!(texture.usage.contains(TextureUsage::OUTPUT_ATTACHMENT));
let old_layout = match trackers
.textures
.query(view.texture_id.value, view.range.clone())
@@ -416,12 +422,13 @@ pub fn command_encoder_begin_render_pass<B: GfxBackend>(
None => {
// Required sub-resources have inconsistent states, we need to
// issue individual barriers instead of relying on the render pass.
let (texture, pending) = trackers.textures.use_replace(
&*texture_guard,
let pending = trackers.textures.change_replace(
view.texture_id.value,
&texture.life_guard.ref_count,
view.range.clone(),
TextureUsage::OUTPUT_ATTACHMENT,
);
barriers.extend(pending.map(|pending| {
trace!("\tresolve {:?}", pending);
hal::memory::Barrier::Image {
+5
View File
@@ -320,6 +320,7 @@ pub fn render_pass_set_index_buffer<B: GfxBackend>(
.buffers
.use_extend(&*buffer_guard, buffer_id, (), BufferUsage::INDEX)
.unwrap();
assert!(buffer.usage.contains(BufferUsage::INDEX));
let range = offset .. buffer.size;
pass.index_state.bound_buffer_view = Some((buffer_id, range));
@@ -368,6 +369,8 @@ pub fn render_pass_set_vertex_buffers<B: GfxBackend>(
.buffers
.use_extend(&*buffer_guard, id, (), BufferUsage::VERTEX)
.unwrap();
assert!(buffer.usage.contains(BufferUsage::VERTEX));
vbs.total_size = buffer.size - offset;
}
@@ -459,6 +462,7 @@ pub fn render_pass_draw_indirect<B: GfxBackend>(
BufferUsage::INDIRECT,
)
.unwrap();
assert!(buffer.usage.contains(BufferUsage::INDIRECT));
unsafe {
pass.raw.draw_indirect(&buffer.raw, indirect_offset, 1, 0);
@@ -541,6 +545,7 @@ pub fn render_pass_draw_indexed_indirect<B: GfxBackend>(
BufferUsage::INDIRECT,
)
.unwrap();
assert!(buffer.usage.contains(BufferUsage::INDIRECT));
unsafe {
pass.raw
+16
View File
@@ -85,6 +85,8 @@ pub fn command_encoder_copy_buffer_to_buffer<B: GfxBackend>(
cmb.trackers
.buffers
.use_replace(&*buffer_guard, source, (), BufferUsage::COPY_SRC);
assert!(src_buffer.usage.contains(BufferUsage::COPY_SRC));
barriers.extend(src_pending.map(|pending| hal::memory::Barrier::Buffer {
states: pending.to_states(),
target: &src_buffer.raw,
@@ -96,6 +98,8 @@ pub fn command_encoder_copy_buffer_to_buffer<B: GfxBackend>(
cmb.trackers
.buffers
.use_replace(&*buffer_guard, destination, (), BufferUsage::COPY_DST);
assert!(dst_buffer.usage.contains(BufferUsage::COPY_DST));
barriers.extend(dst_pending.map(|pending| hal::memory::Barrier::Buffer {
states: pending.to_states(),
target: &dst_buffer.raw,
@@ -155,6 +159,8 @@ pub fn command_encoder_copy_buffer_to_texture<B: GfxBackend>(
cmb.trackers
.buffers
.use_replace(&*buffer_guard, source.buffer, (), BufferUsage::COPY_SRC);
assert!(src_buffer.usage.contains(BufferUsage::COPY_SRC));
let src_barriers = src_pending.map(|pending| hal::memory::Barrier::Buffer {
states: pending.to_states(),
target: &src_buffer.raw,
@@ -168,6 +174,8 @@ pub fn command_encoder_copy_buffer_to_texture<B: GfxBackend>(
destination.to_selector(aspects),
TextureUsage::COPY_DST,
);
assert!(dst_texture.usage.contains(TextureUsage::COPY_DST));
let dst_barriers = dst_pending.map(|pending| hal::memory::Barrier::Image {
states: pending.to_states(),
target: &dst_texture.raw,
@@ -249,6 +257,8 @@ pub fn command_encoder_copy_texture_to_buffer<B: GfxBackend>(
source.to_selector(aspects),
TextureUsage::COPY_SRC,
);
assert!(src_texture.usage.contains(TextureUsage::COPY_SRC));
let src_barriers = src_pending.map(|pending| hal::memory::Barrier::Image {
states: pending.to_states(),
target: &src_texture.raw,
@@ -266,6 +276,8 @@ pub fn command_encoder_copy_texture_to_buffer<B: GfxBackend>(
(),
BufferUsage::COPY_DST,
);
assert!(dst_buffer.usage.contains(BufferUsage::COPY_DST));
let dst_barrier = dst_barriers.map(|pending| hal::memory::Barrier::Buffer {
states: pending.to_states(),
target: &dst_buffer.raw,
@@ -344,6 +356,8 @@ pub fn command_encoder_copy_texture_to_texture<B: GfxBackend>(
source.to_selector(aspects),
TextureUsage::COPY_SRC,
);
assert!(src_texture.usage.contains(TextureUsage::COPY_SRC));
barriers.extend(src_pending.map(|pending| hal::memory::Barrier::Image {
states: pending.to_states(),
target: &src_texture.raw,
@@ -357,6 +371,8 @@ pub fn command_encoder_copy_texture_to_texture<B: GfxBackend>(
destination.to_selector(aspects),
TextureUsage::COPY_DST,
);
assert!(dst_texture.usage.contains(TextureUsage::COPY_DST));
barriers.extend(dst_pending.map(|pending| hal::memory::Barrier::Image {
states: pending.to_states(),
target: &dst_texture.raw,
+18 -4
View File
@@ -633,6 +633,7 @@ impl<B: GfxBackend> Device<B> {
value: self_id,
ref_count: self.life_guard.ref_count.clone(),
},
usage: desc.usage,
memory,
size: desc.size,
mapped_write_ranges: Vec::new(),
@@ -705,6 +706,7 @@ impl<B: GfxBackend> Device<B> {
value: self_id,
ref_count: self.life_guard.ref_count.clone(),
},
usage: desc.usage,
kind,
format: desc.format,
full_range: hal::image::SubresourceRange {
@@ -1173,7 +1175,7 @@ pub fn device_create_bind_group<B: GfxBackend>(
let mut used = TrackerSet::new(B::VARIANT);
{
let (buffer_guard, mut token) = hub.buffers.read(&mut token);
let (_, mut token) = hub.textures.read(&mut token); //skip token
let (texture_guard, mut token) = hub.textures.read(&mut token); //skip token
let (texture_view_guard, mut token) = hub.texture_views.read(&mut token);
let (sampler_guard, _) = hub.samplers.read(&mut token);
@@ -1208,6 +1210,7 @@ pub fn device_create_bind_group<B: GfxBackend>(
.buffers
.use_extend(&*buffer_guard, bb.buffer, (), usage)
.unwrap();
assert!(buffer.usage.contains(usage));
let end = if bb.size == 0 {
None
@@ -1245,14 +1248,16 @@ pub fn device_create_bind_group<B: GfxBackend>(
.views
.use_extend(&*texture_view_guard, id, (), ())
.unwrap();
used.textures
.change_extend(
let texture = used.textures
.use_extend(
&*texture_guard,
view.texture_id.value,
&view.texture_id.ref_count,
view.range.clone(),
usage,
)
.unwrap();
assert!(texture.usage.contains(usage));
hal::pso::Descriptor::Image(&view.raw, image_layout)
}
};
@@ -2018,6 +2023,7 @@ pub fn device_create_swap_chain<B: GfxBackend>(
value: device_id,
ref_count: device.life_guard.ref_count.clone(),
},
usage: resource::TextureUsage::OUTPUT_ATTACHMENT,
kind,
format: desc.format,
full_range: range.clone(),
@@ -2130,6 +2136,14 @@ pub fn buffer_map_async<B: GfxBackend>(
let (mut buffer_guard, _) = hub.buffers.write(&mut token);
let buffer = &mut buffer_guard[buffer_id];
if usage.contains(resource::BufferUsage::MAP_READ) {
assert!(buffer.usage.contains(resource::BufferUsage::MAP_READ));
}
if usage.contains(resource::BufferUsage::MAP_WRITE) {
assert!(buffer.usage.contains(resource::BufferUsage::MAP_WRITE));
}
if buffer.pending_map_operation.is_some() {
operation.call_error();
return;
+2
View File
@@ -89,6 +89,7 @@ impl BufferMapOperation {
pub struct Buffer<B: hal::Backend> {
pub(crate) raw: B::Buffer,
pub(crate) device_id: Stored<DeviceId>,
pub(crate) usage: BufferUsage,
pub(crate) memory: MemoryBlock<B>,
pub(crate) size: BufferAddress,
pub(crate) mapped_write_ranges: Vec<std::ops::Range<u64>>,
@@ -226,6 +227,7 @@ impl<B: hal::Backend> TexturePlacement<B> {
pub struct Texture<B: hal::Backend> {
pub(crate) raw: B::Image,
pub(crate) device_id: Stored<DeviceId>,
pub(crate) usage: TextureUsage,
pub(crate) kind: hal::image::Kind,
pub(crate) format: TextureFormat,
pub(crate) full_range: hal::image::SubresourceRange,