diff options
| author | Mike Schuchardt <mikes@lunarg.com> | 2023-07-10 10:46:26 -0700 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2023-07-10 13:02:27 -0700 |
| commit | 6e7fa4d975f44f1050e554180636dca3fd51fb44 (patch) | |
| tree | 3c7b528ca5fedc0511abfd8f279a14934af95da5 | |
| parent | 39090f9152287903b8fc82877f19366d2f9addaa (diff) | |
| download | usermoji-6e7fa4d975f44f1050e554180636dca3fd51fb44.tar.xz | |
build: Update to header 1.3.257
- Update known-good
- Generate source
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | build-android/vulkan-headers_revision_android | 2 | ||||
| -rw-r--r-- | icd/generated/function_declarations.h | 2 | ||||
| -rwxr-xr-x | scripts/generate_vulkan_wrapper.py | 2 | ||||
| -rw-r--r-- | scripts/known_good.json | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db0ceb11..31edbb24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,7 +149,9 @@ option(TOOLS_CODEGEN "Enable helper codegen target") if (TOOLS_CODEGEN) find_package(Python3 REQUIRED QUIET) add_custom_target(tools_codegen - COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/scripts/generate_source.py ${VULKAN_HEADERS_REGISTRY_DIRECTORY} --incremental --api ${API_TYPE} + COMMAND Python3::Interpreter ${PROJECT_SOURCE_DIR}/scripts/generate_source.py + "${VULKAN_HEADERS_INSTALL_DIR}/${CMAKE_INSTALL_DATADIR}/vulkan/registry" + --incremental --api ${API_TYPE} ) endif() diff --git a/build-android/vulkan-headers_revision_android b/build-android/vulkan-headers_revision_android index bb15548f..e00e07ec 100644 --- a/build-android/vulkan-headers_revision_android +++ b/build-android/vulkan-headers_revision_android @@ -1 +1 @@ -v1.3.255 +v1.3.257 diff --git a/icd/generated/function_declarations.h b/icd/generated/function_declarations.h index 972f82ef..c7e98171 100644 --- a/icd/generated/function_declarations.h +++ b/icd/generated/function_declarations.h @@ -309,7 +309,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = { {"VK_FUCHSIA_external_memory", 1}, {"VK_FUCHSIA_external_semaphore", 1}, {"VK_FUCHSIA_buffer_collection", 2}, - {"VK_HUAWEI_subpass_shading", 2}, + {"VK_HUAWEI_subpass_shading", 3}, {"VK_HUAWEI_invocation_mask", 1}, {"VK_NV_external_memory_rdma", 1}, {"VK_EXT_pipeline_properties", 1}, diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py index 2fec3c04..f2f06460 100755 --- a/scripts/generate_vulkan_wrapper.py +++ b/scripts/generate_vulkan_wrapper.py @@ -1321,7 +1321,7 @@ VK_EXT_depth_clip_control = Extension(name='VK_EXT_depth_clip_control', version= VK_EXT_primitive_topology_list_restart = Extension(name='VK_EXT_primitive_topology_list_restart', version=1, guard=None, commands=[ ]) -VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=2, guard=None, commands=[ +VK_HUAWEI_subpass_shading = Extension(name='VK_HUAWEI_subpass_shading', version=3, guard=None, commands=[ Command(name='vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI', dispatch='VkDevice'), Command(name='vkCmdSubpassShadingHUAWEI', dispatch='VkCommandBuffer'), ]) diff --git a/scripts/known_good.json b/scripts/known_good.json index 96d3b60a..7981770b 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -7,7 +7,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.255" + "commit": "v1.3.257" }, { "name": "MoltenVK", @@ -32,7 +32,7 @@ "sub_dir": "Vulkan-Loader", "build_dir": "Vulkan-Loader/build", "install_dir": "Vulkan-Loader/build/install", - "commit": "v1.3.255", + "commit": "v1.3.257", "deps": [ { "var_name": "VULKAN_HEADERS_INSTALL_DIR", |