Skip to content

Verify that VariablePointerFeatures.* and SubgroupSizeControl.* features can be used #857

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

Merged
dj2 merged 5 commits into from
Jun 3, 2020
Merged

Verify that VariablePointerFeatures.* and SubgroupSizeControl.* features can be used #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
476dbec
Initialize VkPhysicalDeviceSubgroupSizeControlFeaturesEXT
cmarcelo May 28, 2020
3d1c33f
Always use VK_KHR_get_physical_device_properties2 when available
cmarcelo May 11, 2020
eeb5b8c
Fail if VariablePointerFeatures.* are required but not available
cmarcelo May 11, 2020
94a40b1
Fail if SubgroupSizeControl.* features are required but not available
cmarcelo May 27, 2020
4a1ba53
Merge branch 'master' into feature-detection-fixes
dj2 Jun 2, 2020
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
43 changes: 25 additions & 18 deletions samples/config_helper_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,9 @@ ConfigHelperVulkan::ConfigHelperVulkan()
variable_pointers_feature_(VkPhysicalDeviceVariablePointerFeaturesKHR()),
float16_int8_feature_(VkPhysicalDeviceFloat16Int8FeaturesKHR()),
storage_8bit_feature_(VkPhysicalDevice8BitStorageFeaturesKHR()),
storage_16bit_feature_(VkPhysicalDevice16BitStorageFeaturesKHR()) {}
storage_16bit_feature_(VkPhysicalDevice16BitStorageFeaturesKHR()),
subgroup_size_control_feature_(
VkPhysicalDeviceSubgroupSizeControlFeaturesEXT()) {}

ConfigHelperVulkan::~ConfigHelperVulkan() {
if (vulkan_device_)
Expand All @@ -667,8 +669,7 @@ amber::Result ConfigHelperVulkan::CreateVulkanInstance(
uint32_t engine_major,
uint32_t engine_minor,
std::vector<std::string> required_extensions,
bool disable_validation_layer,
bool show_version_info) {
bool disable_validation_layer) {
VkApplicationInfo app_info = VkApplicationInfo();
app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;

Expand Down Expand Up @@ -702,12 +703,10 @@ amber::Result ConfigHelperVulkan::CreateVulkanInstance(
}
}

// If dumping driver info then add useful extensions, if available.
if (show_version_info &&
std::find(available_instance_extensions_.begin(),
if (std::find(available_instance_extensions_.begin(),
available_instance_extensions_.end(),
"VK_KHR_get_physical_device_properties2") !=
available_instance_extensions_.end()) {
available_instance_extensions_.end()) {
required_extensions.push_back("VK_KHR_get_physical_device_properties2");
}

Expand Down Expand Up @@ -763,11 +762,17 @@ amber::Result ConfigHelperVulkan::CheckVulkanPhysicalDeviceRequirements(
VkPhysicalDeviceFeatures();

if (supports_get_physical_device_properties2_) {
VkPhysicalDeviceSubgroupSizeControlFeaturesEXT size_control =
VkPhysicalDeviceSubgroupSizeControlFeaturesEXT();
size_control.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_FEATURES_EXT;
size_control.pNext = nullptr;

VkPhysicalDeviceVariablePointerFeaturesKHR var_ptrs =
VkPhysicalDeviceVariablePointerFeaturesKHR();
var_ptrs.sType =
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR;
var_ptrs.pNext = nullptr;
var_ptrs.pNext = &size_control;

VkPhysicalDeviceFeatures2KHR features2 = VkPhysicalDeviceFeatures2KHR();
features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR;
Expand All @@ -788,13 +793,15 @@ amber::Result ConfigHelperVulkan::CheckVulkanPhysicalDeviceRequirements(
continue;
}

if (feature == kVariablePointers &&
var_ptrs.variablePointers != VK_TRUE) {
continue;
}
if (feature == kVariablePointersStorageBuffer &&
var_ptrs.variablePointersStorageBuffer != VK_TRUE) {
continue;
if ((feature == kVariablePointers &&
var_ptrs.variablePointers == VK_FALSE) ||
(feature == kVariablePointersStorageBuffer &&
var_ptrs.variablePointersStorageBuffer == VK_FALSE) ||
(feature == kSubgroupSizeControl &&
size_control.subgroupSizeControl == VK_FALSE) ||
(feature == kComputeFullSubgroups &&
size_control.computeFullSubgroups == VK_FALSE)) {
return amber::Result("Device does not support all required features");
}
}

Expand Down Expand Up @@ -1155,9 +1162,9 @@ amber::Result ConfigHelperVulkan::CreateConfig(
bool disable_validation_layer,
bool show_version_info,
std::unique_ptr<amber::EngineConfig>* cfg_holder) {
amber::Result r = CreateVulkanInstance(
engine_major, engine_minor, required_instance_extensions,
disable_validation_layer, show_version_info);
amber::Result r = CreateVulkanInstance(engine_major, engine_minor,
required_instance_extensions,
disable_validation_layer);
if (!r.IsSuccess())
return r;

Expand Down
3 changes: 1 addition & 2 deletions samples/config_helper_vulkan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ class ConfigHelperVulkan : public ConfigHelperImpl {
uint32_t engine_major,
uint32_t engine_minor,
std::vector<std::string> required_instance_extensions,
bool disable_validation_layer,
bool show_version_info);
bool disable_validation_layer);

/// Create |vulkan_callback_| that reports validation layer errors
/// via debugCallback() function in config_helper_vulkan.cc.
Expand Down