Skip to content

Commit

Permalink
All hail clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
gwihlidal committed Dec 7, 2018
1 parent e6f4f32 commit 7bd5da7
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub fn set_event(
) {
let mut stage_mask = ash::vk::PipelineStageFlags::TOP_OF_PIPE;
for previous_access in previous_accesses {
let previous_info = get_access_info(previous_access);
let previous_info = get_access_info(*previous_access);
stage_mask |= previous_info.stage_mask;
}

Expand All @@ -93,7 +93,7 @@ pub fn reset_event(
) {
let mut stage_mask = ash::vk::PipelineStageFlags::TOP_OF_PIPE;
for previous_access in previous_accesses {
let previous_info = get_access_info(previous_access);
let previous_info = get_access_info(*previous_access);
stage_mask |= previous_info.stage_mask;
}

Expand Down
22 changes: 11 additions & 11 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,18 +299,18 @@ pub fn get_memory_barrier(
let mut memory_barrier = ash::vk::MemoryBarrier::default();

for previous_access in &barrier.previous_accesses {
let previous_info = get_access_info(previous_access);
let previous_info = get_access_info(*previous_access);

src_stages |= previous_info.stage_mask;

// Add appropriate availability operations - for writes only.
if is_write_access(previous_access) {
if is_write_access(*previous_access) {
memory_barrier.src_access_mask |= previous_info.access_mask;
}
}

for next_access in &barrier.next_accesses {
let next_info = get_access_info(next_access);
let next_info = get_access_info(*next_access);

dst_stages |= next_info.stage_mask;

Expand Down Expand Up @@ -357,18 +357,18 @@ pub fn get_buffer_memory_barrier(
};

for previous_access in &barrier.previous_accesses {
let previous_info = get_access_info(previous_access);
let previous_info = get_access_info(*previous_access);

src_stages |= previous_info.stage_mask;

// Add appropriate availability operations - for writes only.
if is_write_access(previous_access) {
if is_write_access(*previous_access) {
buffer_barrier.src_access_mask |= previous_info.access_mask;
}
}

for next_access in &barrier.next_accesses {
let next_info = get_access_info(next_access);
let next_info = get_access_info(*next_access);

dst_stages |= next_info.stage_mask;

Expand Down Expand Up @@ -414,12 +414,12 @@ pub fn get_image_memory_barrier(
};

for previous_access in &barrier.previous_accesses {
let previous_info = get_access_info(previous_access);
let previous_info = get_access_info(*previous_access);

src_stages |= previous_info.stage_mask;

// Add appropriate availability operations - for writes only.
if is_write_access(previous_access) {
if is_write_access(*previous_access) {
image_barrier.src_access_mask |= previous_info.access_mask;
}

Expand All @@ -446,7 +446,7 @@ pub fn get_image_memory_barrier(
}

for next_access in &barrier.next_accesses {
let next_info = get_access_info(next_access);
let next_info = get_access_info(*next_access);

dst_stages |= next_info.stage_mask;

Expand Down Expand Up @@ -493,7 +493,7 @@ pub(crate) struct AccessInfo {
pub(crate) image_layout: ash::vk::ImageLayout,
}

pub(crate) fn get_access_info(access_type: &AccessType) -> AccessInfo {
pub(crate) fn get_access_info(access_type: AccessType) -> AccessInfo {
match access_type {
AccessType::Nothing => AccessInfo {
stage_mask: ash::vk::PipelineStageFlags::empty(),
Expand Down Expand Up @@ -758,7 +758,7 @@ pub(crate) fn get_access_info(access_type: &AccessType) -> AccessInfo {
}
}

pub(crate) fn is_write_access(access_type: &AccessType) -> bool {
pub(crate) fn is_write_access(access_type: AccessType) -> bool {
match access_type {
AccessType::CommandBufferWriteNVX => true,
AccessType::VertexShaderWrite => true,
Expand Down

0 comments on commit 7bd5da7

Please sign in to comment.