vkconfig: Add generated lib layer settings for vulkan.hpp

Author: christophe-lunarg

vkconfig_core/configurator.cpp

@@ -395,8 +395,11 @@ bool Configurator::Generate(GenerateSettingsMode mode, const Path& output_path)
         case GENERATE_SETTINGS_CMD: {
             result = ::GenerateSettingsEnv(*this, EXPORT_ENV_CMD, output_path);
         } break;
-        case GENERATE_SETTINGS_HPP: {
-            result = ::GenerateSettingsCode(*this, output_path);
+        case GENERATE_SETTINGS_HPP_VULKAN_H: {
+            result = ::GenerateSettingsCode(*this, EXPORT_HPP_VULKAN_H, output_path);
+        } break;
+        case GENERATE_SETTINGS_HPP_VULKAN_HPP: {
+            result = ::GenerateSettingsCode(*this, EXPORT_HPP_VULKAN_HPP, output_path);
         } break;
     }
 

vkconfig_core/configurator.h

@@ -47,6 +47,7 @@ enum EnabledUI {
 };
 
 enum ExportEnvMode { EXPORT_ENV_BASH = 0, EXPORT_ENV_CMD };
+enum ExportHppMode { EXPORT_HPP_VULKAN_H = 0, EXPORT_HPP_VULKAN_HPP };
 
 struct LayersSettings {
     std::string configuration_name;

vkconfig_core/generate_layers_settings_hpp.cpp

@@ -22,7 +22,7 @@
 
 #include <QTextStream>
 
-bool GenerateSettingsCode(Configurator& configurator, const Path& export_path) {
+bool GenerateSettingsCode(Configurator& configurator, ExportHppMode mode, const Path& export_path) {
     QFile file(export_path.AbsolutePath().c_str());
 
     const bool result_layers_file = file.open(QIODevice::WriteOnly | QIODevice::Text);
@@ -368,10 +368,11 @@ bool GenerateSettingsCode(Configurator& configurator, const Path& export_path) {
 
             if (IsArray(setting->type)) {
                 stream << format(
-                              "\t\t\t{\"%s\", \"%s\", %s, static_cast<uint32_t>(this->%s.%s_info.size()), &this->%s.%s_info[0]},\n",
+                              "\t\t\t{\"%s\", \"%s\", %s, static_cast<uint32_t>(this->%s.%s_info.size()), this->%s.%s_info.empty() "
+                              "? nullptr : &this->%s.%s_info[0]},\n",
                               parameter.key.c_str(), setting->key.c_str(), ::GetLayerSettingTypeString(setting->type),
                               ::GetCodeData(parameter.key).c_str(), setting->key.c_str(), ::GetCodeData(parameter.key).c_str(),
-                              setting->key.c_str())
+                              setting->key.c_str(), ::GetCodeData(parameter.key).c_str(), setting->key.c_str())
                               .c_str();
             } else if (IsString(setting->type)) {
                 stream << format("\t\t\t{\"%s\", \"%s\", %s, 1, this->%s.%s.c_str()},\n", parameter.key.c_str(),

vkconfig_core/generate_layers_settings_hpp.h

@@ -22,4 +22,4 @@
 
 #include "configurator.h"
 
-bool GenerateSettingsCode(Configurator& configurator, const Path& export_path);
+bool GenerateSettingsCode(Configurator& configurator, ExportHppMode mode, const Path& export_path);

vkconfig_core/setting_flags.cpp

@@ -140,8 +140,8 @@ std::string SettingDataEnum::Export(ExportMode export_mode) const {
 
                 const std::string& value_name = ::GetSettingValueName(this->meta->layer_key, this->key, value.key);
 
-                result +=
-                    format("static %s %s = \"%s\";\n", ::GetCodeTypeString(this->type), value_name.c_str(), value.key.c_str());
+                result += format("[[maybe_unused]] static %s %s = \"%s\";\n", ::GetCodeTypeString(this->type), value_name.c_str(),
+                                 value.key.c_str());
             }
 
             if (!this->meta->enum_values.empty()) {

vkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.bat

@@ -13,7 +13,7 @@
 :: See the License for the specific language governing permissions and
 :: limitations under the License.
 :: 
-:: This code was generated by Vulkan Configurator 3.4.2
+:: This code was generated by Vulkan Configurator 3.4.3
 
 
 :: reference layer

vkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.sh

@@ -13,7 +13,7 @@
 #! See the License for the specific language governing permissions and
 #! limitations under the License.
 #! 
-#! This code was generated by Vulkan Configurator 3.4.2
+#! This code was generated by Vulkan Configurator 3.4.3
 
 
 #! reference layer

vkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.txt

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # 
-# This code was generated by Vulkan Configurator 3.4.2
+# This code was generated by Vulkan Configurator 3.4.3
 
 # reference layer
 # ==========================================

…ted/VK_LAYER_LUNARG_reference_1_2_1.code …YER_LUNARG_reference_1_2_1.vulkan_h_codevkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.code renamed to vkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.vulkan_h_code vkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.code renamed to vkconfig_core/test/generated/VK_LAYER_LUNARG_reference_1_2_1.vulkan_h_code

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * This code was generated by Vulkan Configurator 3.4.2
+ * This code was generated by Vulkan Configurator 3.4.3
  */
 
 #pragma once
@@ -27,13 +27,13 @@
 struct LayerSettings;
 
 // Possible values for `VK_LAYER_LUNARG_reference_1_2_1` layer `enum_required_only` setting:
-static const char* VL_REFERENCE_1_2_1_ENUM_REQUIRED_ONLY_VALUE0 = "value0";
-static const char* VL_REFERENCE_1_2_1_ENUM_REQUIRED_ONLY_VALUE1 = "value1";
-static const char* VL_REFERENCE_1_2_1_ENUM_REQUIRED_ONLY_VALUE2 = "value2";
+[[maybe_unused]] static const char* VL_REFERENCE_1_2_1_ENUM_REQUIRED_ONLY_VALUE0 = "value0";
+[[maybe_unused]] static const char* VL_REFERENCE_1_2_1_ENUM_REQUIRED_ONLY_VALUE1 = "value1";
+[[maybe_unused]] static const char* VL_REFERENCE_1_2_1_ENUM_REQUIRED_ONLY_VALUE2 = "value2";
 
 // Possible values for `VK_LAYER_LUNARG_reference_1_2_1` layer `enum_with_optional` setting:
-static const char* VL_REFERENCE_1_2_1_ENUM_WITH_OPTIONAL_VALUE1 = "value1";
-static const char* VL_REFERENCE_1_2_1_ENUM_WITH_OPTIONAL_VALUE2 = "value2";
+[[maybe_unused]] static const char* VL_REFERENCE_1_2_1_ENUM_WITH_OPTIONAL_VALUE1 = "value1";
+[[maybe_unused]] static const char* VL_REFERENCE_1_2_1_ENUM_WITH_OPTIONAL_VALUE2 = "value2";
 
 // Possible values for VK_LAYER_LUNARG_reference_1_2_1 layer flags_required_only setting:
 static const char* VL_REFERENCE_1_2_1_FLAGS_REQUIRED_ONLY_FLAG0 = "flag0";