build: Update to 1.3.257 headers

Also remove VK_NV_cooperative_matrix and VK_QNX_external_memory_screen_buffer
from codegen

CMakeLists.txt

@@ -190,16 +190,16 @@ endif()
 # Define macro used for building vk.xml generated files
 function(run_vulkantools_vk_xml_generate dependency output)
     add_custom_command(OUTPUT ${output}
-        COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output}
-        DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/vk.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py
+        COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/vk.xml -scripts ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry ${output} -removeExtensions VK_NV_cooperative_matrix -removeExtensions VK_QNX_external_memory_screen_buffer
+        DEPENDS ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/vk.xml ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/reg.py
     )
 endfunction()
 
 # Define macro used for building video.xml generated files
 function(run_vulkantools_video_xml_generate dependency output)
     add_custom_command(OUTPUT ${output}
-        COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/video.xml -scripts ${VULKAN_HEADERS_REGISTRY_DIRECTORY} ${output}
-        DEPENDS ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/video.xml ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY}/reg.py
+        COMMAND ${PYTHON_CMD} -B ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py -registry ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/video.xml -scripts ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry ${output}
+        DEPENDS ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/video.xml ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/generator.py ${VULKANTOOLS_SCRIPTS_DIR}/${dependency} ${VULKANTOOLS_SCRIPTS_DIR}/vt_genvk.py ${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry/reg.py
     )
 endfunction()
 

build-android/cmake/layerlib/CMakeLists.txt

@@ -38,7 +38,7 @@ add_library(layer_utils STATIC
         ${SRC_DIR}/layers/vk_layer_config.cpp
         ${SRC_DIR}/layers/vk_layer_extension_utils.cpp
         ${SRC_DIR}/layers/vk_layer_utils.cpp
-        ${SRC_DIR}/layers/generated/vk_format_utils.cpp)
+        ${SRC_DIR}/layers/vulkan/generated/vk_format_utils.cpp)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_clone}")
 
 # build core_validation layers

build-android/jni/Android.mk

@@ -27,7 +27,7 @@ LOCAL_SRC_FILES += $(LVL_DIR)/layers/vk_layer_config.cpp
 LOCAL_SRC_FILES += $(LVL_DIR)/layers/utils/vk_layer_extension_utils.cpp
 LOCAL_SRC_FILES += $(LVL_DIR)/layers/error_message/logging.cpp
 LOCAL_SRC_FILES += $(LVL_DIR)/layers/utils/vk_layer_utils.cpp
-LOCAL_SRC_FILES += $(LVL_DIR)/layers/generated/vk_format_utils.cpp
+LOCAL_SRC_FILES += $(LVL_DIR)/layers/vulkan/generated/vk_format_utils.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/vku/vk_layer_settings.cpp
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(THIRD_PARTY)/Vulkan-Headers/include \
                     $(SRC_DIR)/vku \

build-android/vulkan-headers_revision_android

@@ -1 +1 @@
-v1.3.250
+v1.3.257

build-android/vulkan-tools_revision_android

@@ -1 +1 @@
-v1.3.250
+v1.3.257

build-android/vulkan-validationlayers_revision_android

@@ -1 +1 @@
-v1.3.250
+v1.3.257

layersvt/screenshot.cpp

@@ -111,6 +111,8 @@ static inline char *local_getenv(const char *name) {
 static inline void local_free_getenv(const char *val) { free((void *)val); }
 #endif
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
 namespace screenshot {
 
 std::mutex globalLock;

scripts/api_dump_generator.py

@@ -82,6 +82,8 @@
 #include "api_dump_html.h"
 #include "api_dump_json.h"
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
 // Specifically implemented functions
 
 #if defined(__GNUC__) && __GNUC__ >= 4

scripts/known_good.json

@@ -6,7 +6,7 @@
             "sub_dir": "Vulkan-Headers",
             "build_dir": "Vulkan-Headers/build",
             "install_dir": "Vulkan-Headers/build/install",
-            "commit": "v1.3.250"
+            "commit": "v1.3.257"
         },
         {
             "name": "Vulkan-Utility-Libraries",
@@ -28,7 +28,7 @@
             "sub_dir": "Vulkan-Loader",
             "build_dir": "Vulkan-Loader/build",
             "install_dir": "Vulkan-Loader/build/install",
-            "commit": "v1.3.250",
+            "commit": "v1.3.257",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",
@@ -49,7 +49,7 @@
             "sub_dir": "Vulkan-Tools",
             "build_dir": "Vulkan-Tools/build",
             "install_dir": "Vulkan-Tools/build/install",
-            "commit": "v1.3.250",
+            "commit": "v1.3.257",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",
@@ -74,7 +74,7 @@
             "sub_dir": "Vulkan-ValidationLayers",
             "build_dir": "Vulkan-ValidationLayers/build",
             "install_dir": "Vulkan-ValidationLayers/build/install",
-            "commit": "v1.3.250",
+            "commit": "v1.3.257",
             "deps": [
                 {
                     "var_name": "VULKAN_HEADERS_INSTALL_DIR",