diff --git a/DEPS b/DEPS index ca2ff5d54..c81948fd1 100644 --- a/DEPS +++ b/DEPS @@ -206,7 +206,7 @@ deps = { }, 'third_party/vulkan-deps': { - 'url': '{chromium_git}/vulkan-deps@b08eace32e9cb8dd7dce9866f051558ac57acb15', + 'url': '{chromium_git}/vulkan-deps@cbab637962d0eea7a3d27dab75c6e1a8c77ba16a', 'condition': 'not build_with_chromium', }, diff --git a/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json b/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json index 184795816..3a08d2f41 100644 --- a/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json +++ b/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json @@ -2,11 +2,11 @@ "src/libANGLE/renderer/angle_format.py": "32ba71942c0fd00e6807104f1bb80a3c", "src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py": - "81b0f05df8707c886bb80fe0214acb6e", + "791db4381676327e49c7a9046423136a", "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json": "fa2bd54c1bb0ab2cf1d386061a4bc5c5", "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp": "8bfd8a3857c2b9062d7ada46c7d27bcf", "third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml": - "a3961cf58e819e8ef966bf4f1c356e33" + "e7129a174322b4f0a2c8c1229e91f04c" } \ No newline at end of file diff --git a/scripts/export_targets.py b/scripts/export_targets.py index 791a8a3f9..ea0088259 100755 --- a/scripts/export_targets.py +++ b/scripts/export_targets.py @@ -211,6 +211,7 @@ IGNORED_INCLUDES = { b'libANGLE/renderer/vulkan/win32/DisplayVkWin32.h', b'libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h', b'loader_cmake_config.h', + b'optick.h', b'spirv-tools/libspirv.h', b'third_party/volk/volk.h', b'vk_loader_extensions.c', diff --git a/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py b/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py index 0f248f2d2..3e171a11d 100644 --- a/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py +++ b/src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py @@ -20,7 +20,7 @@ template_table_autogen_cpp = """// GENERATED FILE - DO NOT EDIT. // the vk.xml file situated at // /third_party/vulkan-validation-layers/src/scripts/vk.xml // -// Copyright {copyright_year} The ANGLE Project Authors. All rights reserved. +// Copyright 2020 The ANGLE Project Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -126,7 +126,6 @@ def main(): ] output_cpp = template_table_autogen_cpp.format( - copyright_year=date.today().year, num_formats=num_formats, format_case_data="\n,".join(vk_cases), script_name=__file__,