vkconfig: Load all Vulkan drivers from a path

Author: christophe-lunarg

vkconfig_core/configurator.cpp

@@ -1160,8 +1160,8 @@ bool Configurator::Load() {
                 }
             }
 
-            if (json_object.value("last_driver_path") != QJsonValue::Undefined) {
-                this->last_driver_path = json_object.value("last_driver_path").toString().toStdString();
+            if (json_object.value("last_driver_dir") != QJsonValue::Undefined) {
+                this->last_driver_dir = json_object.value("last_driver_dir").toString().toStdString();
             }
             if (json_object.value("driver_paths") != QJsonValue::Undefined) {
                 const QJsonObject& json_object_paths = json_object.value("driver_paths").toObject();
@@ -1349,7 +1349,7 @@ bool Configurator::Save() const {
         }
         json_object.insert("driver_override_list", json_driver_override_list_array);
 
-        json_object.insert("last_driver_path", this->last_driver_path.RelativePath().c_str());
+        json_object.insert("last_driver_dir", this->last_driver_dir.RelativePath().c_str());
         QJsonObject json_object_paths;
         for (auto it = this->driver_paths.begin(); it != this->driver_paths.end(); ++it) {
             QJsonObject json_object_path;

vkconfig_core/configurator.h

@@ -169,7 +169,7 @@ class Configurator {
     TabType active_tab = TAB_CONFIGURATIONS;
     bool advanced = true;
     Path last_path_status = Path(Path::HOME).AbsolutePath() + "/diagnostics";
-    Path last_driver_path = Path(Path::HOME).AbsolutePath() + "/*.json";
+    Path last_driver_dir = Path(Path::HOME).AbsolutePath();
     Path last_path_launch_log = Path(Path::HOME).AbsolutePath() + "/application_log.txt";
     Version online_sdk_version = Version::NONE;
     Version latest_sdk_version = Version::NONE;

vkconfig_core/registry.cpp

@@ -214,6 +214,10 @@ std::vector<LayersPathInfo> LoadRegistrySoftwareLayers(const char *path, LayerTy
         info.type = type;
         info.path = path.IsFile() ? path.AbsoluteDir() : path.AbsolutePath();
 
+        if (!path.Exists()) {
+            continue;
+        }
+
         if (::Found(result, info.path)) {
             continue;
         }

vkconfig_gui/CHANGELOG.md

@@ -14,6 +14,7 @@
 - Add preferences settings to show "Vulkan Executables Scope"
 - Add `vkconfig.json` backup when doing a "Reset To Default" #2570
 - Add "Discard Ordering and Enabling Layers" default configuration #2596
+- Improve Vulkan drivers loading, add all drivers in a part at once
 
 ### Fixes:
 - Fix command line whitespace decoding #2625

vkconfig_gui/tab_drivers.cpp

@@ -135,7 +135,7 @@ void TabDrivers::UpdateUI(UpdateUIMode ui_update_mode) {
             this->ui->driver_group_box_paths->blockSignals(false);
 
             this->ui->driver_paths_list->clear();
-            this->ui->driver_path_lineedit->setText(configurator.last_driver_path.RelativePath().c_str());
+            this->ui->driver_path_lineedit->setText(configurator.last_driver_dir.RelativePath().c_str());
             this->ui->driver_paths_list->blockSignals(true);
 
             for (auto it = configurator.driver_paths.begin(); it != configurator.driver_paths.end(); ++it) {
@@ -252,8 +252,8 @@ void TabDrivers::on_driver_append_pressed() {
 
     if (!selected_path.Exists()) {
         QMessageBox alert;
-        alert.setWindowTitle("Vulkan Driver Manifest file not found");
-        alert.setText("The path");
+        alert.setWindowTitle("Vulkan Driver Manifest directory not found");
+        alert.setText("The directory:");
         alert.setInformativeText(selected_path.AbsolutePath().c_str());
         alert.setStandardButtons(QMessageBox::Ok);
         alert.setDefaultButton(QMessageBox::Ok);
@@ -262,8 +262,12 @@ void TabDrivers::on_driver_append_pressed() {
         return;
     }
 
-    configurator.driver_paths.insert(std::pair(selected_path, true));
-    configurator.last_driver_path = selected_path;
+    configurator.last_driver_dir = selected_path;
+
+    const std::vector<Path> drivers_paths = ::CollectFilePaths(selected_path);
+    for (std::size_t i = 0, n = drivers_paths.size(); i < n; ++i) {
+        configurator.driver_paths.insert(std::pair(drivers_paths[i], true));
+    }
 
     configurator.UpdateVulkanSystemInfo();
 
@@ -273,9 +277,10 @@ void TabDrivers::on_driver_append_pressed() {
 void TabDrivers::on_driver_browse_pressed() {
     Configurator &configurator = Configurator::Get();
 
-    const Path &selected_path = QFileDialog::getOpenFileName(this->ui->driver_browse_button, "Adding a Driver Manifests File...",
-                                                             configurator.last_driver_path.AbsolutePath().c_str(), "*.json")
-                                    .toStdString();
+    const Path &selected_path =
+        QFileDialog::getExistingDirectory(this->ui->driver_browse_button, "Adding Driver Manifests Directory...",
+                                          configurator.last_driver_dir.AbsolutePath().c_str())
+            .toStdString();
 
     if (selected_path.Empty()) {
         return;

vkconfig_gui/tab_layers.cpp

@@ -64,6 +64,15 @@ void TabLayers::UpdateUI_LayersPaths(UpdateUIMode ui_update_mode) {
 
                 std::vector<LayersPathInfo> &paths_group = configurator.layers.paths[group_path];
                 for (std::size_t i = 0, n = paths_group.size(); i < n; ++i) {
+                    const std::string &layer_path = paths_group[i].path.AbsolutePath();
+                    const std::vector<Path> &manifest_paths = CollectFilePaths(layer_path);
+                    /*
+                                        if (group_path != LAYERS_PATHS_GUI) {
+                                            if (manifest_paths.empty()) {
+                                                continue;
+                                            }
+                                        }
+                    */
                     QTreeWidgetItem *item_state = new QTreeWidgetItem;
                     item_state->setFlags(item_state->flags() | Qt::ItemIsSelectable);
                     item_state->setSizeHint(0, QSize(0, ITEM_HEIGHT));
@@ -75,9 +84,6 @@ void TabLayers::UpdateUI_LayersPaths(UpdateUIMode ui_update_mode) {
                     ui->layers_paths_tree->addTopLevelItem(item_state);
                     ui->layers_paths_tree->setItemWidget(item_state, 0, layer_path_widget);
 
-                    const std::string &layer_path = paths_group[i].path.AbsolutePath();
-                    const std::vector<Path> &manifest_paths = CollectFilePaths(layer_path);
-
                     for (std::size_t manifest_index = 0, manifest_count = manifest_paths.size(); manifest_index < manifest_count;
                          ++manifest_index) {
                         const Layer *layer = configurator.layers.FindFromManifest(manifest_paths[manifest_index], true);
@@ -97,6 +103,8 @@ void TabLayers::UpdateUI_LayersPaths(UpdateUIMode ui_update_mode) {
                             label += format(" (%s)", GetToken(layer->status));
                         }
 
+                        // label += " - " + layer->manifest_path.AbsolutePath();
+
                         QTreeWidgetItem *item = new QTreeWidgetItem;
                         item->setText(0, label.c_str());
                         item->setToolTip(0, layer->manifest_path.AbsolutePath().c_str());

vkconfig_gui/tab_preferences.cpp

@@ -170,7 +170,7 @@ void TabPreferences::on_theme_mode_changed(int index) {
     this->ui->configurations_settings_reset->setIcon(::Get(new_theme_mode, ::ICON_RELOAD));
 
     // Drivers
-    this->ui->driver_browse_button->setIcon(::Get(new_theme_mode, ::ICON_FILE_SEARCH));
+    this->ui->driver_browse_button->setIcon(::Get(new_theme_mode, ::ICON_FOLDER_SEARCH));
 
     // Layers
     this->ui->layers_browse_button->setIcon(::Get(new_theme_mode, ::ICON_FOLDER_SEARCH));