From 4b3d0ff01dedda8d6bbe89312fd25f5c06c44346 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Mon, 18 Nov 2024 19:21:41 +0100 Subject: [PATCH] narcissus-gpu: Use defaults for queue families --- engine/narcissus-gpu/src/backend/vulkan/barrier.rs | 2 -- engine/narcissus-gpu/src/backend/vulkan/mod.rs | 6 ------ 2 files changed, 8 deletions(-) diff --git a/engine/narcissus-gpu/src/backend/vulkan/barrier.rs b/engine/narcissus-gpu/src/backend/vulkan/barrier.rs index 3bdcacd..16aa810 100644 --- a/engine/narcissus-gpu/src/backend/vulkan/barrier.rs +++ b/engine/narcissus-gpu/src/backend/vulkan/barrier.rs @@ -328,8 +328,6 @@ pub fn vulkan_image_memory_barrier( dst_access_mask, old_layout, new_layout, - src_queue_family_index: 0, - dst_queue_family_index: 0, image, subresource_range, ..default() diff --git a/engine/narcissus-gpu/src/backend/vulkan/mod.rs b/engine/narcissus-gpu/src/backend/vulkan/mod.rs index 2c4da23..7373ac9 100644 --- a/engine/narcissus-gpu/src/backend/vulkan/mod.rs +++ b/engine/narcissus-gpu/src/backend/vulkan/mod.rs @@ -2260,8 +2260,6 @@ impl Device for VulkanDevice { src_access_mask: vk::AccessFlags2::NONE, dst_stage_mask: vk::PipelineStageFlags2::COMPUTE_SHADER, dst_access_mask: vk::AccessFlags2::SHADER_STORAGE_WRITE, - src_queue_family_index: self.universal_queue_family_index, - dst_queue_family_index: self.universal_queue_family_index, old_layout: vk::ImageLayout::Undefined, new_layout: vk::ImageLayout::General, image: image.image, @@ -2548,8 +2546,6 @@ impl Device for VulkanDevice { src_access_mask: vk::AccessFlags2::NONE, dst_stage_mask: vk::PipelineStageFlags2::COLOR_ATTACHMENT_OUTPUT, dst_access_mask: vk::AccessFlags2::COLOR_ATTACHMENT_WRITE, - src_queue_family_index: self.universal_queue_family_index, - dst_queue_family_index: self.universal_queue_family_index, old_layout: vk::ImageLayout::Undefined, new_layout: vk::ImageLayout::AttachmentOptimal, image: image.image, @@ -2740,8 +2736,6 @@ impl Device for VulkanDevice { // see: dst_stage_mask: stage_mask, dst_access_mask: vk::AccessFlags2::NONE, - src_queue_family_index: self.universal_queue_family_index, - dst_queue_family_index: self.universal_queue_family_index, old_layout: layout, new_layout: vk::ImageLayout::PresentSrcKhr, image, -- 2.49.0