mirror/vk-bootstrap
1
0
Fork 0
mirror of https://github.com/charles-lunarg/vk-bootstrap.git synced 2024-11-26 08:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Cleanup and asserts for VkPhysicalDeviceFeatures2.""

Browse Source 
This reverts commit db55cb8f27.
This commit is contained in:
Charles Giessen 2021-04-18 14:14:17 -06:00
parent a0d1ce5b39
commit 90875cfaf5
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/VkBootstrap.cpp
View File

@ -908,7 +908,6 @@ bool supports_features(VkPhysicalDeviceFeatures supported,
if (requested.inheritedQueries && !supported.inheritedQueries) return false; if (requested.inheritedQueries && !supported.inheritedQueries) return false;
for(auto i = 0; i < extension_requested.size(); ++i) { for(auto i = 0; i < extension_requested.size(); ++i) {
//auto res = extension_requested[i].match(extension_supported[i]);
auto res = GenericFeaturesPNextNode::match(extension_requested[i], extension_supported[i]); auto res = GenericFeaturesPNextNode::match(extension_requested[i], extension_supported[i]);
if(!res) return false; if(!res) return false;
} }
@ -1411,27 +1410,37 @@ detail::Result<Device> DeviceBuilder::build() const {
extensions.push_back({ VK_KHR_SWAPCHAIN_EXTENSION_NAME }); extensions.push_back({ VK_KHR_SWAPCHAIN_EXTENSION_NAME });
bool has_phys_dev_features_2 = false; bool has_phys_dev_features_2 = false;
bool user_defined_phys_dev_features_2 = false;
std::vector<VkBaseOutStructure*> final_pnext_chain; std::vector<VkBaseOutStructure*> final_pnext_chain;
VkDeviceCreateInfo device_create_info = {};
#if defined(VK_API_VERSION_1_1) #if defined(VK_API_VERSION_1_1)
for(auto& pnext : info.pNext_chain) {
if(pnext->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2) {
user_defined_phys_dev_features_2 = true;
break;
}
}
auto physical_device_extension_features_copy = physical_device.extended_features_chain;
VkPhysicalDeviceFeatures2 local_features2{}; VkPhysicalDeviceFeatures2 local_features2{};
local_features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; local_features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
auto physical_device_extension_features_copy = physical_device.extended_features_chain;
if(!user_defined_phys_dev_features_2) {
if (physical_device.instance_version >= VK_MAKE_VERSION(1, 1, 0)) { if (physical_device.instance_version >= VK_MAKE_VERSION(1, 1, 0)) {
local_features2.features = physical_device.features;
final_pnext_chain.push_back(reinterpret_cast<VkBaseOutStructure*>(&local_features2));
has_phys_dev_features_2 = true; has_phys_dev_features_2 = true;
for(auto& features_node : physical_device_extension_features_copy) { for (auto& features_node : physical_device_extension_features_copy) {
final_pnext_chain.push_back(reinterpret_cast<VkBaseOutStructure*>(&features_node)); final_pnext_chain.push_back(reinterpret_cast<VkBaseOutStructure*>(&features_node));
} }
} }
#endif }
VkDeviceCreateInfo device_create_info = {}; if(!user_defined_phys_dev_features_2 && !has_phys_dev_features_2) {
device_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; device_create_info.pEnabledFeatures = &physical_device.features;
device_create_info.flags = info.flags; }
device_create_info.queueCreateInfoCount = static_cast<uint32_t>(queueCreateInfos.size()); #endif
device_create_info.pQueueCreateInfos = queueCreateInfos.data();
device_create_info.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
device_create_info.ppEnabledExtensionNames = extensions.data();
for(auto& pnext : info.pNext_chain) { for(auto& pnext : info.pNext_chain) {
final_pnext_chain.push_back(pnext); final_pnext_chain.push_back(pnext);
@ -1442,20 +1451,16 @@ detail::Result<Device> DeviceBuilder::build() const {
assert(node->sType != VK_STRUCTURE_TYPE_APPLICATION_INFO); assert(node->sType != VK_STRUCTURE_TYPE_APPLICATION_INFO);
} }
#if defined(VK_API_VERSION_1_1) device_create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
// VUID-VkDeviceCreateInfo-pNext-00373 - don't add pEnabledFeatures if the phys_dev_features_2 is present device_create_info.flags = info.flags;
if (has_phys_dev_features_2) { device_create_info.queueCreateInfoCount = static_cast<uint32_t>(queueCreateInfos.size());
device_create_info.pNext = &local_features2; device_create_info.pQueueCreateInfos = queueCreateInfos.data();
device_create_info.enabledExtensionCount = static_cast<uint32_t>(extensions.size());
device_create_info.ppEnabledExtensionNames = extensions.data();
if(!final_pnext_chain.empty()) { if(!final_pnext_chain.empty()) {
local_features2.pNext = final_pnext_chain.front(); device_create_info.pNext = final_pnext_chain.front();
} }
device_create_info.pEnabledFeatures = nullptr;
} else {
device_create_info.pEnabledFeatures = &physical_device.features;
}
#else
device_create_info.pEnabledFeatures = &physical_device.features;
#endif
Device device; Device device;

9
src/VkBootstrap.h
View File

@ -124,18 +124,18 @@ struct GenericFeaturesPNextNode {
VkStructureType sType = static_cast<VkStructureType>(0); VkStructureType sType = static_cast<VkStructureType>(0);
void* pNext = nullptr; void* pNext = nullptr;
VkBool32 fields[256]; static const uint32_t field_capacity = 256;
VkBool32 fields[field_capacity];
template <typename T> template <typename T>
void set(T const& features) { void set(T const& features) {
GenericFeaturesPNextNode node;
*reinterpret_cast<T*>(this) = features; *reinterpret_cast<T*>(this) = features;
} }
static bool match(GenericFeaturesPNextNode const& requested, GenericFeaturesPNextNode const& supported) { static bool match(GenericFeaturesPNextNode const& requested, GenericFeaturesPNextNode const& supported) {
assert(requested.sType == supported.sType && assert(requested.sType == supported.sType &&
"Non-matching sTypes in features nodes!"); "Non-matching sTypes in features nodes!");
for (uint32_t i = 0; i < (sizeof(fields) / sizeof(VkBool32)); i++) { for (uint32_t i = 0; i < field_capacity; i++) {
if (requested.fields[i] && !supported.fields[i]) return false; if (requested.fields[i] && !supported.fields[i]) return false;
} }
return true; return true;
@ -362,6 +362,7 @@ struct PhysicalDevice {
VkPhysicalDevice physical_device = VK_NULL_HANDLE; VkPhysicalDevice physical_device = VK_NULL_HANDLE;
VkSurfaceKHR surface = VK_NULL_HANDLE; VkSurfaceKHR surface = VK_NULL_HANDLE;
// Note that this reflects selected features carried over from required features, not all features the physical device supports.
VkPhysicalDeviceFeatures features{}; VkPhysicalDeviceFeatures features{};
VkPhysicalDeviceProperties properties{}; VkPhysicalDeviceProperties properties{};
VkPhysicalDeviceMemoryProperties memory_properties{}; VkPhysicalDeviceMemoryProperties memory_properties{};
@ -450,6 +451,8 @@ class PhysicalDeviceSelector {
PhysicalDeviceSelector& add_required_extension_features(T const& features) { PhysicalDeviceSelector& add_required_extension_features(T const& features) {
assert(features.sType != 0 && assert(features.sType != 0 &&
"Features struct sType must be filled with the struct's corresponding VkStructureType enum"); "Features struct sType must be filled with the struct's corresponding VkStructureType enum");
assert(features.sType != VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2 &&
"Do not pass VkPhysicalDeviceFeatures2 as a required extension feature structure. An instance of this is managed internally for selection criteria and device creation.");
detail::GenericFeaturesPNextNode node; detail::GenericFeaturesPNextNode node;
node.set(features); node.set(features);
criteria.extended_features_chain.push_back(node); criteria.extended_features_chain.push_back(node);