ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Vulkan v2] Properly include, clean up queue families

This commit is contained in:
Triang3l 2019-08-09 22:40:55 +03:00
parent 001120605b
commit 30ba2619f3
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/xenia/ui/vk/vulkan_provider.cc
View File

@ -134,7 +134,6 @@ bool VulkanProvider::Initialize() {
VkPhysicalDeviceProperties physical_device_properties; VkPhysicalDeviceProperties physical_device_properties;
std::vector<VkExtensionProperties> physical_device_extensions; std::vector<VkExtensionProperties> physical_device_extensions;
std::vector<VkQueueFamilyProperties> queue_families; std::vector<VkQueueFamilyProperties> queue_families;
uint32_t queue_family = UINT32_MAX;
bool sparse_residency_buffer = false; bool sparse_residency_buffer = false;
for (; physical_device_index < physical_device_index_end; for (; physical_device_index < physical_device_index_end;
++physical_device_index) { ++physical_device_index) {
@ -172,9 +171,9 @@ bool VulkanProvider::Initialize() {
} }
sparse_residency_buffer = physical_device_features_.sparseBinding && sparse_residency_buffer = physical_device_features_.sparseBinding &&
physical_device_features_.sparseResidencyBuffer; physical_device_features_.sparseResidencyBuffer;
// Get a queue supporting graphics, compute and transfer, and if available, // Get a queue supporting graphics and compute, and if available, also
// also sparse memory management. // sparse memory management.
queue_family = UINT32_MAX; graphics_queue_family_ = UINT32_MAX;
uint32_t queue_family_count; uint32_t queue_family_count;
vkGetPhysicalDeviceQueueFamilyProperties(physical_device, vkGetPhysicalDeviceQueueFamilyProperties(physical_device,
&queue_family_count, nullptr); &queue_family_count, nullptr);
@ -182,7 +181,7 @@ bool VulkanProvider::Initialize() {
vkGetPhysicalDeviceQueueFamilyProperties( vkGetPhysicalDeviceQueueFamilyProperties(
physical_device, &queue_family_count, queue_families.data()); physical_device, &queue_family_count, queue_families.data());
const uint32_t queue_flags_required = const uint32_t queue_flags_required =
VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT; VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT;
for (uint32_t i = 0; i < queue_family_count; ++i) { for (uint32_t i = 0; i < queue_family_count; ++i) {
const VkQueueFamilyProperties& queue_family_properties = const VkQueueFamilyProperties& queue_family_properties =
queue_families[i]; queue_families[i];
@ -196,7 +195,7 @@ bool VulkanProvider::Initialize() {
queue_flags_required) { queue_flags_required) {
continue; continue;
} }
queue_family = i; graphics_queue_family_ = i;
if (!sparse_residency_buffer || if (!sparse_residency_buffer ||
(queue_family_properties.queueFlags & VK_QUEUE_SPARSE_BINDING_BIT)) { (queue_family_properties.queueFlags & VK_QUEUE_SPARSE_BINDING_BIT)) {
// Found a fully compatible queue family, stop searching for a family // Found a fully compatible queue family, stop searching for a family
@ -204,10 +203,10 @@ bool VulkanProvider::Initialize() {
break; break;
} }
} }
if (queue_family == UINT32_MAX) { if (graphics_queue_family_ == UINT32_MAX) {
continue; continue;
} }
if (!(queue_families[queue_family].queueFlags & if (!(queue_families[graphics_queue_family_].queueFlags &
VK_QUEUE_SPARSE_BINDING_BIT)) { VK_QUEUE_SPARSE_BINDING_BIT)) {
sparse_residency_buffer = false; sparse_residency_buffer = false;
} }
@ -233,7 +232,7 @@ bool VulkanProvider::Initialize() {
queue_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queue_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
queue_create_info.pNext = nullptr; queue_create_info.pNext = nullptr;
queue_create_info.flags = 0; queue_create_info.flags = 0;
queue_create_info.queueFamilyIndex = queue_family; queue_create_info.queueFamilyIndex = graphics_queue_family_;
queue_create_info.queueCount = 1; queue_create_info.queueCount = 1;
queue_create_info.pQueuePriorities = &queue_priority; queue_create_info.pQueuePriorities = &queue_priority;
const char* const device_extensions[] = { const char* const device_extensions[] = {
@ -258,7 +257,7 @@ bool VulkanProvider::Initialize() {
return false; return false;
} }
volkLoadDevice(device_); volkLoadDevice(device_);
vkGetDeviceQueue(device_, queue_family, 0, &graphics_queue_); vkGetDeviceQueue(device_, graphics_queue_family_, 0, &graphics_queue_);
return true; return true;
} }

16
src/xenia/ui/vk/vulkan_provider.h
View File

@ -10,14 +10,24 @@
#ifndef XENIA_UI_VK_VULKAN_PROVIDER_H_ #ifndef XENIA_UI_VK_VULKAN_PROVIDER_H_
#define XENIA_UI_VK_VULKAN_PROVIDER_H_ #define XENIA_UI_VK_VULKAN_PROVIDER_H_
#include <cstdint>
#include <memory> #include <memory>
#include "xenia/base/platform.h"
#include "xenia/ui/graphics_provider.h"
#ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES
#endif
#include "third_party/vulkan/vulkan.h"
#if XE_PLATFORM_WIN32
#include "third_party/vulkan/vulkan_win32.h"
#include "xenia/base/platform_win.h"
#endif
#include "third_party/volk/volk.h" #include "third_party/volk/volk.h"
#define XELOGVK XELOGI #define XELOGVK XELOGI
#include "xenia/ui/graphics_provider.h"
namespace xe { namespace xe {
namespace ui { namespace ui {
namespace vk { namespace vk {
@ -38,6 +48,7 @@ class VulkanProvider : public GraphicsProvider {
return physical_device_features_; return physical_device_features_;
} }
VkDevice GetDevice() const { return device_; } VkDevice GetDevice() const { return device_; }
uint32_t GetGraphicsQueueFamily() const { return graphics_queue_family_; }
VkQueue GetGraphicsQueue() const { return graphics_queue_; } VkQueue GetGraphicsQueue() const { return graphics_queue_; }
private: private:
@ -49,6 +60,7 @@ class VulkanProvider : public GraphicsProvider {
VkPhysicalDevice physical_device_ = VK_NULL_HANDLE; VkPhysicalDevice physical_device_ = VK_NULL_HANDLE;
VkPhysicalDeviceFeatures physical_device_features_; VkPhysicalDeviceFeatures physical_device_features_;
VkDevice device_ = VK_NULL_HANDLE; VkDevice device_ = VK_NULL_HANDLE;
uint32_t graphics_queue_family_ = UINT32_MAX;
VkQueue graphics_queue_ = VK_NULL_HANDLE; VkQueue graphics_queue_ = VK_NULL_HANDLE;
}; };