Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrap queues with a mutex each, finally required #76

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Wrap queues with a mutex each, finally required #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions include/vierkant/Device.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ class Device
uint32_t num_queues = 0;
};

struct queue_asset_t
{
VkQueue queue = VK_NULL_HANDLE;
std::unique_ptr<std::mutex> mutex;
};

struct properties_t
{
VkPhysicalDeviceProperties core;
Expand Down Expand Up @@ -79,6 +85,9 @@ class Device
//! short-circuit function-pointers directly to device/driver entries (useful if only a single device exists)
bool direct_function_pointers = false;

//! maximum number of queues to create, default: 0 (no limit)
uint32_t max_num_queues = 0;

//! optional VkSurface
VkSurfaceKHR surface = VK_NULL_HANDLE;

Expand Down Expand Up @@ -129,7 +138,7 @@ class Device
/**
* @return handle for queues
*/
[[nodiscard]] const std::vector<VkQueue> &queues(Queue type) const;
[[nodiscard]] const std::vector<queue_asset_t> &queues(Queue type) const;

/**
* @return const ref to the used QueueFamilyIndices
Expand Down Expand Up @@ -183,7 +192,7 @@ class Device
VkSampleCountFlagBits m_max_usable_samples = VK_SAMPLE_COUNT_1_BIT;

// a map holding all queues for logical device
std::map<Queue, std::vector<VkQueue>> m_queues;
std::map<Queue, std::vector<queue_asset_t>> m_queues;

// keeps track of queue family indices
std::map<Queue, queue_family_info_t> m_queue_indices;
Expand Down
16 changes: 9 additions & 7 deletions src/Device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const char *g_validation_layers[] = {"VK_LAYER_KHRONOS_validation"};

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

const std::vector<VkQueue> g_empty_queue;
const std::vector<Device::queue_asset_t> g_empty_queue;

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -345,16 +345,18 @@ Device::Device(const create_info_t &create_info) : m_physical_device(create_info
// short-circuit function-pointers to point directly add device/driver entries
if(create_info.direct_function_pointers) { volkLoadDevice(m_device); }

auto get_all_queues = [this](Queue type) {
auto get_all_queues = [this, create_info](Queue type) {
if(m_queue_indices[type].index >= 0)
{
auto num_queues = m_queue_indices[type].num_queues;

m_queues[type].resize(num_queues);
num_queues = create_info.max_num_queues ? std::min(num_queues, create_info.max_num_queues) : num_queues;

for(uint32_t i = 0; i < num_queues; ++i)
{
vkGetDeviceQueue(m_device, static_cast<uint32_t>(m_queue_indices[type].index), i, &m_queues[type][i]);
queue_asset_t queue_asset = {};
queue_asset.mutex = std::make_unique<std::mutex>();
vkGetDeviceQueue(m_device, static_cast<uint32_t>(m_queue_indices[type].index), i, &queue_asset.queue);
m_queues[type].push_back(std::move(queue_asset));
}
}
};
Expand Down Expand Up @@ -431,13 +433,13 @@ VkQueue Device::queue(Queue type) const
{
auto queue_it = m_queues.find(type);

if(queue_it != m_queues.end() && !queue_it->second.empty()) { return queue_it->second.front(); }
if(queue_it != m_queues.end() && !queue_it->second.empty()) { return queue_it->second.front().queue; }
return VK_NULL_HANDLE;
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

const std::vector<VkQueue> &Device::queues(Queue type) const
const std::vector<Device::queue_asset_t> &Device::queues(Queue type) const
{
auto queue_it = m_queues.find(type);

Expand Down
4 changes: 2 additions & 2 deletions tests/TestSemaphore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ TEST(Semaphore, WaitBeforeSignal)
auto semaphore = vierkant::Semaphore(testContext.device, 0);

// two independent queues
auto queue1 = testContext.device->queues(vierkant::Device::Queue::COMPUTE).front();
auto queue2 = testContext.device->queues(vierkant::Device::Queue::GRAPHICS).back();
auto queue1 = testContext.device->queues(vierkant::Device::Queue::COMPUTE).front().queue;
auto queue2 = testContext.device->queues(vierkant::Device::Queue::GRAPHICS).back().queue;

constexpr uint64_t signal1 = 42, signal2 = 666;

Expand Down
3 changes: 3 additions & 0 deletions tests/test_context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ class vulkan_test_context_t
device_info.instance = instance.handle();
device_info.physical_device = physical_device;
device_info.use_validation = instance.use_validation_layers();

// limit testing to two queues
device_info.max_num_queues = 2;
device_info.surface = surface;
device_info.extensions = device_extensions;
device = vierkant::Device::create(device_info);
Expand Down
Loading