Skip to content

Fix -V driver version info #736

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 2 commits into from
Dec 2, 2019
Merged

Fix -V driver version info #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9a2e0e
Fix -V driver version info
paulthomson Nov 29, 2019
6ef2309
Merge branch 'master' into amber_v_fix
dj2 Dec 1, 2019
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
66 changes: 44 additions & 22 deletions samples/config_helper_vulkan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,8 @@ amber::Result ConfigHelperVulkan::CreateVulkanInstance(
uint32_t engine_major,
uint32_t engine_minor,
std::vector<std::string> required_extensions,
bool disable_validation_layer) {
bool disable_validation_layer,
bool show_version_info) {
VkApplicationInfo app_info = VkApplicationInfo();
app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
app_info.apiVersion = VK_MAKE_VERSION(engine_major, engine_minor, 0);
Expand Down Expand Up @@ -654,10 +655,19 @@ amber::Result ConfigHelperVulkan::CreateVulkanInstance(
}
}

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

// Determine if VkPhysicalDeviceProperties2KHR should be used
for (auto& ext : required_extensions) {
if (ext == "VK_KHR_get_physical_device_properties2") {
use_physical_device_features2_ = true;
supports_get_physical_device_properties2_ = true;
}
}

Expand Down Expand Up @@ -706,7 +716,7 @@ amber::Result ConfigHelperVulkan::CheckVulkanPhysicalDeviceRequirements(
VkPhysicalDeviceFeatures required_vulkan_features =
VkPhysicalDeviceFeatures();

if (use_physical_device_features2_) {
if (supports_get_physical_device_properties2_) {
VkPhysicalDeviceVariablePointerFeaturesKHR var_ptrs =
VkPhysicalDeviceVariablePointerFeaturesKHR();
var_ptrs.sType =
Expand Down Expand Up @@ -850,7 +860,7 @@ amber::Result ConfigHelperVulkan::CreateVulkanDevice(
static_cast<uint32_t>(required_extensions_in_char.size());
info.ppEnabledExtensionNames = required_extensions_in_char.data();

if (use_physical_device_features2_)
if (supports_get_physical_device_properties2_)
return CreateDeviceWithFeatures2(required_features, &info);
return CreateDeviceWithFeatures1(required_features, &info);
}
Expand Down Expand Up @@ -927,7 +937,6 @@ void ConfigHelperVulkan::DumpPhysicalDeviceInfo() {
// extension is unavailable.
};

bool driver_properties_available = false;
VkPhysicalDeviceDriverPropertiesKHR driver_properties = {
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR,
nullptr,
Expand All @@ -937,21 +946,34 @@ void ConfigHelperVulkan::DumpPhysicalDeviceInfo() {
{},
};

if (std::find(available_instance_extensions_.begin(),
available_instance_extensions_.end(),
"VK_KHR_get_physical_device_properties2") !=
available_instance_extensions_.end()) {
if (std::find(available_device_extensions_.begin(),
available_device_extensions_.end(),
"VK_KHR_driver_properties") !=
available_device_extensions_.end()) {
properties2.pNext = &driver_properties;
driver_properties_available = true;
}
auto vkGetPhysicalDeviceProperties2KHR =
// If the vkGetPhysicalDeviceProperties2KHR function is unavailable (because
// the "VK_KHR_get_physical_device_properties2" extension is unavailable or
// because vkGetInstanceProcAddr failed) or the "VK_KHR_driver_properties"
// extension is unavailable, then this will stay as nullptr and we will
// instead call the older vkGetPhysicalDeviceProperties function.
PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR =
nullptr;

if (supports_get_physical_device_properties2_ &&
std::find(available_device_extensions_.begin(),
available_device_extensions_.end(),
"VK_KHR_driver_properties") !=
available_device_extensions_.end()) {
properties2.pNext = &driver_properties;

vkGetPhysicalDeviceProperties2KHR =
reinterpret_cast<PFN_vkGetPhysicalDeviceProperties2KHR>(
vkGetInstanceProcAddr(vulkan_instance_,
"vkGetPhysicalDeviceProperties2"));
"vkGetPhysicalDeviceProperties2KHR"));
if (!vkGetPhysicalDeviceProperties2KHR) {
std::cout << "Warning: device claimed to support "
"vkGetPhysicalDeviceProperties2KHR but could not find this "
"function."
<< std::endl;
}
}

if (vkGetPhysicalDeviceProperties2KHR) {
vkGetPhysicalDeviceProperties2KHR(vulkan_physical_device_, &properties2);
} else {
vkGetPhysicalDeviceProperties(vulkan_physical_device_,
Expand All @@ -973,7 +995,7 @@ void ConfigHelperVulkan::DumpPhysicalDeviceInfo() {
std::cout << " deviceType: " << deviceTypeToName(props.deviceType)
<< std::endl;
std::cout << " deviceName: " << props.deviceName << std::endl;
if (driver_properties_available) {
if (vkGetPhysicalDeviceProperties2KHR) {
std::cout << " driverName: " << driver_properties.driverName << std::endl;
std::cout << " driverInfo: " << driver_properties.driverInfo << std::endl;
}
Expand All @@ -990,9 +1012,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);
amber::Result r = CreateVulkanInstance(
engine_major, engine_minor, required_instance_extensions,
disable_validation_layer, show_version_info);
if (!r.IsSuccess())
return r;

Expand Down
5 changes: 3 additions & 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,7 +58,8 @@ class ConfigHelperVulkan : public ConfigHelperImpl {
uint32_t engine_major,
uint32_t engine_minor,
std::vector<std::string> required_instance_extensions,
bool disable_validation_layer);
bool disable_validation_layer,
bool show_version_info);

/// Create |vulkan_callback_| that reports validation layer errors
/// via debugCallback() function in config_helper_vulkan.cc.
Expand Down Expand Up @@ -108,7 +109,7 @@ class ConfigHelperVulkan : public ConfigHelperImpl {
VkQueue vulkan_queue_ = VK_NULL_HANDLE;
VkDevice vulkan_device_ = VK_NULL_HANDLE;

bool use_physical_device_features2_ = false;
bool supports_get_physical_device_properties2_ = false;
VkPhysicalDeviceFeatures available_features_;
VkPhysicalDeviceFeatures2KHR available_features2_;
VkPhysicalDeviceVariablePointerFeaturesKHR variable_pointers_feature_;
Expand Down