Merge remote-tracking branch 'upstream/vulkan-sdk-1.3.280' into ubunt…

…u/jammy-unstable
johnzupin · Mar 18, 2024 · 38e1a35 · 38e1a35
2 parents 342d712 + 1369760
commit 38e1a35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -84,7 +84,7 @@ jobs:
                 -D BUILD_WERROR=ON \
                 -D INSTALL_ICD=ON \
                 -D BUILD_TESTS=ON \
-                -D ENABLE_ADDRESS_SANITIZER=ON
+                -D ENABLE_ADDRESS_SANITIZER=OFF # Re-enable when github CI doesn't have fatal issues
               env:
                 CC: ${{matrix.cc}}
                 CXX: ${{matrix.cxx}}

diff --git a/scripts/vulkaninfo_generator.py b/scripts/vulkaninfo_generator.py
@@ -656,7 +656,7 @@ def PrintStructure(struct, types_to_gen):
                 out += '    }\n'
             else:  # dynamic array length based on other member
                 out += f'    if (obj.{v.arrayLength} == 0) {{\n'
-                out += f'        p.PrintKeyValue("{v.name}", "NULL");\n'
+                out += f'        p.PrintKeyString("{v.name}", "NULL");\n'
                 out += '    } else {\n'
                 out += f'        ArrayWrapper arr(p,"{v.name}", obj.{v.arrayLength});\n'
                 out += f'        for (uint32_t i = 0; i < obj.{v.arrayLength}; i++) {{\n'

diff --git a/vulkaninfo/generated/vulkaninfo.hpp b/vulkaninfo/generated/vulkaninfo.hpp
@@ -1989,7 +1989,7 @@ void DumpVkPhysicalDeviceHostImageCopyPropertiesEXT(Printer &p, std::string name
     p.SetMinKeyWidth(35);
     p.PrintKeyValue("copySrcLayoutCount", obj.copySrcLayoutCount);
     if (obj.copySrcLayoutCount == 0) {
-        p.PrintKeyValue("pCopySrcLayouts", "NULL");
+        p.PrintKeyString("pCopySrcLayouts", "NULL");
     } else {
         ArrayWrapper arr(p,"pCopySrcLayouts", obj.copySrcLayoutCount);
         for (uint32_t i = 0; i < obj.copySrcLayoutCount; i++) {
@@ -2004,7 +2004,7 @@ void DumpVkPhysicalDeviceHostImageCopyPropertiesEXT(Printer &p, std::string name
     }
     p.PrintKeyValue("copyDstLayoutCount", obj.copyDstLayoutCount);
     if (obj.copyDstLayoutCount == 0) {
-        p.PrintKeyValue("pCopyDstLayouts", "NULL");
+        p.PrintKeyString("pCopyDstLayouts", "NULL");
     } else {
         ArrayWrapper arr(p,"pCopyDstLayouts", obj.copyDstLayoutCount);
         for (uint32_t i = 0; i < obj.copyDstLayoutCount; i++) {
@@ -3304,7 +3304,7 @@ void DumpVkSurfacePresentModeCompatibilityEXT(Printer &p, std::string name, cons
     p.SetMinKeyWidth(31);
     p.PrintKeyValue("presentModeCount", obj.presentModeCount);
     if (obj.presentModeCount == 0) {
-        p.PrintKeyValue("pPresentModes", "NULL");
+        p.PrintKeyString("pPresentModes", "NULL");
     } else {
         ArrayWrapper arr(p,"pPresentModes", obj.presentModeCount);
         for (uint32_t i = 0; i < obj.presentModeCount; i++) {