BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

22 files changed, 288 insertions, 256 deletions

diff --git a/chromium/third_party/angle/scripts/bootstrap.py b/chromium/third_party/angle/scripts/bootstrap.py
index e039007714a..c505ffaff7b 100755
--- a/chromium/third_party/angle/scripts/bootstrap.py
+++ b/chromium/third_party/angle/scripts/bootstrap.py
@@ -28,8 +28,12 @@ def main():
     with open('.gclient') as gclient_file:
         content = gclient_file.read()
 
+    content = content.replace('change2dot', '.')
+    if sys.platform.startswith('linux') or sys.platform == 'darwin':
+        content += 'target_os = [ \'android\' ]\n'
+
     with open('.gclient', 'w') as gclient_file:
-        gclient_file.write(content.replace('change2dot', '.'))
+        gclient_file.write(content)
 
     print 'created .gclient'
 
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_format.json b/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_format.json
index 17855321d00..21832d395fa 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_format.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_format.json
@@ -2,11 +2,11 @@
   "src/libANGLE/renderer/FormatID_autogen.h":
     "bbdb3beae2da4629e3583d6d014ebb2d",
   "src/libANGLE/renderer/Format_table_autogen.cpp":
-    "ef632d9cf04b4ba6103f80b61ac26bc9",
+    "29000a1abc79c129662637f76e7d2a03",
   "src/libANGLE/renderer/angle_format.py":
     "32ba71942c0fd00e6807104f1bb80a3c",
   "src/libANGLE/renderer/angle_format_data.json":
-    "b8bfe470c31b12b27f3a2bdb0288e4be",
+    "e5cc162abe241ea9ba270309c8ec1330",
   "src/libANGLE/renderer/angle_format_map.json":
     "c79d833aea7007c7d0d51cdaa9b265a6",
   "src/libANGLE/renderer/gen_angle_format_table.py":
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_shader_translator.json b/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_shader_translator.json
index ce72f6eb4cb..3162776ed89 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_shader_translator.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/ANGLE_shader_translator.json
@@ -4,15 +4,15 @@
   "src/compiler/translator/generate_parser.py":
     "566178ecdfae3a29803b3687fc518ebb",
   "src/compiler/translator/glslang.l":
-    "76676b64d51f4312e8060f4a00bc8f1b",
+    "5af9feeb7ba8549265f8d19ec7f43343",
   "src/compiler/translator/glslang.y":
-    "609c38a1997b77a9affec84541daf9c9",
+    "1619aa1587a5fae94df9d143af732b77",
   "src/compiler/translator/glslang_lex_autogen.cpp":
-    "edc229f6d1b48f8588301219df80760e",
+    "4b94107e3314432cfdc8f9e90909e5a0",
   "src/compiler/translator/glslang_tab_autogen.cpp":
-    "8872811534b4e8aeef0df354bbd05044",
+    "fc0ab4cb3179dc0d936ed9d56bb2dbd0",
   "src/compiler/translator/glslang_tab_autogen.h":
-    "1bb42872dd5fd0a6f647201b142b67b6",
+    "7be1b46407ec9671626ef3594bcec57e",
   "tools/flex-bison/linux/bison.sha1":
     "efa86001f00e7bcfdbe899dd15fc88e0",
   "tools/flex-bison/linux/flex.sha1":
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json b/chromium/third_party/angle/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
index 591b0561ec4..8013a361a45 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/GL_CTS_(dEQP)_build_files.json
@@ -22,7 +22,7 @@
   "third_party/VK-GL-CTS/src/external/openglcts/modules/CMakeLists.txt":
     "9852754780cd9522f93644d2d99b271d",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/common/CMakeLists.txt":
-    "6fac0f4254e7792284fb086547210811",
+    "e5f5eb5359e32f1f12cd1d6457edcd89",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/common/subgroups/CMakeLists.txt":
     "bf71ce2d9756ccee7833a789737e6481",
   "third_party/VK-GL-CTS/src/external/openglcts/modules/gl/CMakeLists.txt":
@@ -44,7 +44,7 @@
   "third_party/VK-GL-CTS/src/external/vulkancts/framework/vulkan/CMakeLists.txt":
     "7f90f08bea39abbd86db1503b716a536",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/CMakeLists.txt":
-    "58a0f556db356700cfbf93396fc9be74",
+    "c5c879c900d1e3bc8c0b8227c123bcfd",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/amber/CMakeLists.txt":
     "6728615fdef5984e305934f10efc6892",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/api/CMakeLists.txt":
@@ -62,7 +62,7 @@
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/device_group/CMakeLists.txt":
     "6f9fe60553924ea0fe38b8e660fbdc5c",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/draw/CMakeLists.txt":
-    "bafb72d398e80d60a9b5257e1922619f",
+    "92ea2fa6142ef3c6e701a798a994a0b5",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/dynamic_state/CMakeLists.txt":
     "ba2bba86426f1dc9eb16bccc2df60111",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/fragment_ops/CMakeLists.txt":
@@ -79,10 +79,12 @@
     "6eebdaaecb4bf9a7fe4ed42994ac873c",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/memory_model/CMakeLists.txt":
     "e799b8ebf89ddd33b5f85d9ce07d45ae",
+  "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/modifiers/CMakeLists.txt":
+    "08416538f6226b6d597c1ab32f9ce9db",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/multiview/CMakeLists.txt":
     "16a341e4f08e85adad6dbf0309883f5b",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt":
-    "06f7c84ea6b80e9bcb8d7df50946d827",
+    "d6c5f7539eefcbf9615e5bb50d81a368",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/protected_memory/CMakeLists.txt":
     "62389a457fa79ff09317b745e0c2f4aa",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/query_pool/CMakeLists.txt":
@@ -110,7 +112,7 @@
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/tessellation/CMakeLists.txt":
     "bd315c04bf5adb9f63e8c991fbde1e34",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/texture/CMakeLists.txt":
-    "e1a6c593990fbf68ada75efba89410fb",
+    "41bfe3629296269cd08631845599cf19",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/transform_feedback/CMakeLists.txt":
     "e2e32f34bcd3cbbfce6c49a997f34934",
   "third_party/VK-GL-CTS/src/external/vulkancts/modules/vulkan/ubo/CMakeLists.txt":
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_WGL_loader.json b/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
index f11ea672df7..fb9dddabc9a 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_WGL_loader.json
@@ -2,7 +2,7 @@
   "scripts/egl.xml":
     "842e24514c4cfe09fba703c17a0fd292",
   "scripts/egl_angle_ext.xml":
-    "854e99785af19f8f4eea4f73005a0451",
+    "087d6a3996a91fbb0b664cac57c50c4c",
   "scripts/generate_loader.py":
     "c6c02d859fabc61410470f50198a5a80",
   "scripts/gl.xml":
@@ -10,17 +10,17 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "b2902e02f495a9cc85082c47e7b73ac9",
+    "f45ffbc8a3c8a7144c2e98e19d1127a0",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libEGL/egl_loader_autogen.cpp":
-    "acf3ea19b84b12bfd1197fed020440b3",
+    "394c31d7e61b285be5bc6a2cb8325a8d",
   "src/libEGL/egl_loader_autogen.h":
-    "5f1507c78b970f6898d1e90da20e425d",
+    "343b43d7318884204c0699cfaa8ef2dc",
   "util/egl_loader_autogen.cpp":
-    "c2a5f6cb5e3531de16860ffc4f9df6d5",
+    "6eb720862e78992d0ed3abfe50bfa0ff",
   "util/egl_loader_autogen.h":
-    "3b5804374e184203cd3f89cee12a0e57",
+    "591c6d6b1ae0a90758204993ca2638a0",
   "util/gles_loader_autogen.cpp":
     "e4d3034c13ac10c76b854c2749379939",
   "util/gles_loader_autogen.h":
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_entry_points.json b/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_entry_points.json
index c5f093e8fdb..fb6ebeb1372 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_entry_points.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/GL_EGL_entry_points.json
@@ -2,7 +2,7 @@
   "scripts/egl.xml":
     "842e24514c4cfe09fba703c17a0fd292",
   "scripts/egl_angle_ext.xml":
-    "854e99785af19f8f4eea4f73005a0451",
+    "087d6a3996a91fbb0b664cac57c50c4c",
   "scripts/entry_point_packed_gl_enums.json":
     "63f508a08611e75810daedb297dca0e9",
   "scripts/generate_entry_points.py":
@@ -12,7 +12,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "b2902e02f495a9cc85082c47e7b73ac9",
+    "f45ffbc8a3c8a7144c2e98e19d1127a0",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libANGLE/Context_gl_1_0_autogen.h":
@@ -64,7 +64,7 @@
   "src/libANGLE/Context_gles_3_2_autogen.h":
     "e26f7ee7b59a89a4f5337171816b8336",
   "src/libANGLE/Context_gles_ext_autogen.h":
-    "70b088f16d539f1fe7f3ec39a2fd2c34",
+    "612224fcc2fad9b416ac97f91ee5c997",
   "src/libANGLE/capture_gles_1_0_autogen.cpp":
     "96fc0f501e2e696ab911dad8b400dfb2",
   "src/libANGLE/capture_gles_1_0_autogen.h":
@@ -88,7 +88,7 @@
   "src/libANGLE/capture_gles_ext_autogen.cpp":
     "96cb5043ebfce349c89ece3afec6d9f8",
   "src/libANGLE/capture_gles_ext_autogen.h":
-    "2993ff4c127fb3dca52c96b4a86d7f69",
+    "c9f5522755fb58bd544e5faf27c09771",
   "src/libANGLE/entry_points_enum_autogen.cpp":
     "66f09d4f9e6f8e83f2f6f0cf8fc3f3d9",
   "src/libANGLE/entry_points_enum_autogen.h":
@@ -110,7 +110,7 @@
   "src/libANGLE/validationES3_autogen.h":
     "86ba503835328438158d9a464943f3bd",
   "src/libANGLE/validationESEXT_autogen.h":
-    "9a7f7c129e12ab2660f1ef5d6dd73cd5",
+    "5ce1c63470531137fbd327a1d6f1d6e9",
   "src/libANGLE/validationGL11_autogen.h":
     "aadd145c1404de9c34d6b7c00404f10f",
   "src/libANGLE/validationGL12_autogen.h":
@@ -250,15 +250,15 @@
   "src/libGLESv2/entry_points_gles_3_2_autogen.h":
     "5798aa0a73af1d4ba5dfe99b6217a247",
   "src/libGLESv2/entry_points_gles_ext_autogen.cpp":
-    "f24b9311081f4307a4b02cec669753b9",
+    "404a6ba3715aa03a3595aa4a232d4ba3",
   "src/libGLESv2/entry_points_gles_ext_autogen.h":
-    "97bdf48e620471b21e3d250254ac847f",
+    "de27fde4dca5559e594d5aa4589afa36",
   "src/libGLESv2/libGLESv2_autogen.cpp":
-    "0d79a167f0e86a7adcdebfe26ed331a9",
+    "60649d6c45cb07f341f8f06f4bd7d101",
   "src/libGLESv2/libGLESv2_autogen.def":
-    "ff7562ae9bdf8763fea7ba09e5cbb1b4",
+    "355b36db208d53a2276fe948fd6ba568",
   "src/libGLESv2/libGLESv2_no_capture_autogen.def":
-    "affecd039c50674887d6c7bd9b06d4ce",
+    "b8724eeed021c3cefc2878bf2dc28c32",
   "src/libGLESv2/libGLESv2_with_capture_autogen.def":
-    "5a9fce5f01b3b2150cbce447f02e7873"
+    "c7297239ec1b1b13f0fc81bac5b6600a"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/GLenum_value_to_string_map.json b/chromium/third_party/angle/scripts/code_generation_hashes/GLenum_value_to_string_map.json
index 3a4cd315d3a..3eb8bf7284c 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/GLenum_value_to_string_map.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/GLenum_value_to_string_map.json
@@ -6,7 +6,7 @@
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "b2902e02f495a9cc85082c47e7b73ac9",
+    "f45ffbc8a3c8a7144c2e98e19d1127a0",
   "src/libANGLE/gl_enum_utils_autogen.cpp":
     "48627c0865d15bf4014327de5858d3c5",
   "src/libANGLE/gl_enum_utils_autogen.h":
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/Metal_default_shaders.json b/chromium/third_party/angle/scripts/code_generation_hashes/Metal_default_shaders.json
index 01e21805722..709f367d8f9 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/Metal_default_shaders.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/Metal_default_shaders.json
@@ -1,12 +1,12 @@
 {
   "src/libANGLE/renderer/metal/shaders/blit.metal":
-    "86cad2bdbbed1fe7ec94f4ce01ede0c1",
+    "9281aba529ceb4ed5131b7f9c0515362",
   "src/libANGLE/renderer/metal/shaders/clear.metal":
     "1c231afc6100433a79fce49046aa5965",
   "src/libANGLE/renderer/metal/shaders/common.h":
-    "d44903e10552301d7ec89c1a0e6e0862",
+    "569171e345ef36dd6a3b12aeebfae4a6",
   "src/libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders.inc":
-    "ae02216e4b3588d28b0e87a54deddabb",
+    "c42c37285c375de9a065b925ed54aebd",
   "src/libANGLE/renderer/metal/shaders/gen_indices.metal":
     "002511e2b980a7fca7e80cbda6a82712",
   "src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py":
@@ -14,5 +14,5 @@
   "src/libANGLE/renderer/metal/shaders/master_source.metal":
     "fbe6f4bfb49a48ae87791a4cff5fab0a",
   "src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc":
-    "492ddcfd51acfc95d02de2658cf999cd"
+    "8a94beb0d979f472d71686b6f95b624f"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/Static_builtins.json b/chromium/third_party/angle/scripts/code_generation_hashes/Static_builtins.json
index 44d103fdd2b..be2d75a9eb9 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/Static_builtins.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/Static_builtins.json
@@ -1,30 +1,30 @@
 {
   "src/compiler/translator/ImmutableString_ESSL_autogen.cpp":
-    "0025705dc18b69c702b64644806a799c",
+    "0ea93a3bc04293f610fdbfae45f8e436",
   "src/compiler/translator/ImmutableString_autogen.cpp":
-    "0af0ec12d54ecc032b74b58dd3526129",
+    "f3b0095f9f8669520698c845085ab62e",
   "src/compiler/translator/ParseContext_ESSL_autogen.h":
-    "c753d946807cca10df7f50ca2db8a47a",
+    "45035f9e1e7cd735476fc250e034bc72",
   "src/compiler/translator/ParseContext_complete_autogen.h":
-    "dc88a43c877a9955c909e73c4da34176",
+    "d116f43b2e3b61a73b26b301be561e0b",
   "src/compiler/translator/SymbolTable_ESSL_autogen.cpp":
-    "98e1c96985096c1bbe0625983f67a23e",
+    "6f3e49f813ca1fa93de47514b3390dfe",
   "src/compiler/translator/SymbolTable_autogen.cpp":
-    "73ac6e5df17521d8cd6734450a9788a0",
+    "912d1ec634bf4178d310de6db46066f3",
   "src/compiler/translator/SymbolTable_autogen.h":
     "2d8bed6ff5debc6546199a2add316a66",
   "src/compiler/translator/builtin_function_declarations.txt":
-    "e4a0add049ebbaa8dc5b6c630816b7f8",
+    "52e0dd28d8be3a0430b70c23d2b060aa",
   "src/compiler/translator/builtin_variables.json":
     "98d347a6ed181eca3d89bfd73193d787",
   "src/compiler/translator/gen_builtin_symbols.py":
     "ef6fde209ca86ffb1752fc3a5b9d72d7",
   "src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h":
-    "aa5d8059a42adb2fb833c84e86726b95",
+    "2ca793d3326d9e39e7d4ffbca7041e52",
   "src/compiler/translator/tree_util/BuiltIn_complete_autogen.h":
-    "cf8312c854b06d9fe4ede0daa67b5060",
+    "f3713a80fc4ffee53ba4992cc275d5b7",
   "src/tests/compiler_tests/ImmutableString_test_ESSL_autogen.cpp":
-    "f3a7e48b43b08c17682a3bb5502fc016",
+    "14cbdec9c41ae4a27910347b2c5e59ef",
   "src/tests/compiler_tests/ImmutableString_test_autogen.cpp":
-    "673110e754ad8ea6939a736b88a781bc"
+    "d368befd9e4c194c5f6b987b3628a184"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json b/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
index ac1279918fc..6617206ee27 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_internal_shader_programs.json
@@ -1,268 +1,290 @@
 {
   "src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py":
-    "8a13b2f4f77d51928db01eceb2c4ad44",
+    "3ce99036d0abc8c18a818c1e8f394530",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000000.inc":
-    "31832c377e532cd5ea05aab57154b8f8",
+    "69cf6390dea8cba6594e6a7734283600",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000001.inc":
-    "44399440e0d3653e376bc131019ba56c",
+    "00253e9090d4f97de5c50d32d944f08d",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000002.inc":
-    "5a2d04bbe107e0db12c262a7c17ffab3",
+    "541cf1d53c94195d52b1609b2e1ec7c3",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000003.inc":
-    "c225749b909241e4bfb7ad4a2768a55c",
+    "360f366d7a09dc76ba68a3beb5dbfd82",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000004.inc":
-    "02c996226dcc9a0cbaaebdc7ffc4dc33",
+    "970606a8602102ec2d4cb44f792a1af7",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000005.inc":
-    "8b6dfd0df0f45a66cb6595759959de55",
+    "84a86aeebf697c600c57f7c474a670be",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000006.inc":
-    "3996dfddf368871447ed2cd1ca7ff529",
+    "bc61b89f9e6ef1c9975ded4f3c4e7841",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000007.inc":
-    "2568d648d844cf2fde1e89aaf501bfe6",
+    "0395c63adc614bf3709baaaa6a135e8b",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000008.inc":
-    "704cb6281b209926d4bfc93b1ae39b1d",
+    "bbceaa344fed5fcabf1d21538a6abb2f",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000009.inc":
-    "71a85d208a6cc25b32fc9a34ee94516e",
+    "a6175c832b2dbc67934cce5e1dc20070",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000A.inc":
-    "7fb4eeb8b1da792cf6dcb365ac5cdca0",
+    "a9acf6d1140101d662f709125a937513",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000B.inc":
-    "2e0ea5429a1fea0539b419a15cac2705",
+    "b3692963d9f28aa50bca4c173f704181",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000C.inc":
-    "2e5122a296727e3648084939887aa71c",
+    "20c11dcff652604d924974924ee7ae78",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000D.inc":
-    "439bd3c79750462511819df3b6dd5a56",
+    "7e4989585e31a50d78324b4637998d05",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000E.inc":
-    "817005017ff3c55559154d4cd6411d96",
+    "2cfb116b93098d63b85ccad1f4ea076b",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.0000000F.inc":
-    "80e41f753f8cd1d954634048e7381274",
+    "50c75eca24379c233271d639bde106c6",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000010.inc":
-    "ff3ad27ed1639011d78728db58912a03",
+    "929a2a7bafb367cfcf46661abbda5f02",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000011.inc":
-    "a80653f4029710d86dfef836b9deeb60",
+    "68dcda854240740790888165af7dd17d",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000012.inc":
-    "07de4271bcfd417515f1cf3b65c21c7c",
+    "6e18654ad1ba81773fc9f4a8d9a4c773",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000013.inc":
-    "cfc2abc28c9681e013d60e38978ff76d",
+    "f54e4aa72fa9b20726d4c9a8ae3df37e",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000014.inc":
-    "07ab5a568600768dd4cd9ccee4826983",
+    "f877b8450d791d2c5b91ce1eebfa7eeb",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000015.inc":
-    "28282523945655ba482f1921e5972430",
+    "b072ef1b6812648804d37b746b35fecd",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000016.inc":
-    "903904a0ba1a2c1c616f7827a731a348",
+    "8f00a3829de511230d1b312591c843bd",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolve.frag.00000017.inc":
-    "a37988787a932094a61ef9fee8df5953",
+    "afe23d592732094c4f0a6153aca6ed8a",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000000.inc":
-    "ffc867930d60b7c6ece8ed573b34c252",
+    "8012b4158ef3bf51de59e23491e28074",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000001.inc":
-    "ad6d858ff428cdc79d9d53f178588b66",
+    "b05029cd47fe08066808ffe9e1599ed8",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000002.inc":
-    "08ffa324bea88e9ad98114e037b71dd9",
+    "8728c5ebd423acf6961cd1c650ccae9d",
   "src/libANGLE/renderer/vulkan/shaders/gen/BlitResolveStencilNoExport.comp.00000003.inc":
-    "606e3e09c4206c051373c98f1123d0ad",
+    "f3f103ba46a4140d21081532816aed4f",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc":
-    "3a329491f40adbd83ad6fdfb94fc93bb",
+    "aff9c6fe7eab332f9d3b2c3854b47216",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc":
-    "484fbed7ae880d49e4f770f5af7a771d",
+    "160453f4c8ace7315eb2aa396ddfe112",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc":
-    "295a5de4ffd772906b523db657d153ef",
+    "95479eb603fcfe6358f99c1cc27642f4",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc":
-    "e4991957b54a504c1e81a32187d4d84c",
+    "c159bf1a9aaaa64d1244d3b858833af9",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc":
-    "7bbf204e7f1844ff8f098cc1d04251e6",
+    "07d7ec80d9f561305d3c67d8558400bd",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc":
-    "0aaae82049ca8b0453b19e7935a289d2",
+    "ac4e1466bf8959c98bcb477edaf24ba0",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc":
-    "29b414e8849a5229d8d49f5b05acdbea",
+    "d360addf9fa5c79a25dae38c8d5bdf7f",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc":
-    "60efe6cd8271dfa207ed68333886fd72",
+    "12d56f65e96010f6cf5990491b709b4e",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc":
-    "50fb7837fb78fb56418d93187cd74a51",
+    "1792af19f12ee130c6fe489dc646ebb7",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc":
-    "f6dbd68fb1450dab66961ba948c12706",
+    "a08cc010c6233a31eeb99787262d99bd",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc":
-    "6cd0c588e2de50b61fe04e80b006e26e",
+    "71f97ae08b7f829601092deedf21f9c9",
   "src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc":
-    "7e13d5325d35f96045e920a1cb3598bc",
+    "2a74c523d5793800ee64297cf6f8233e",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000000.inc":
-    "2eb01d29bfbe67165fe2ac22f889b65e",
+    "692df1827ad87ad01d7b22c2bcc88700",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000001.inc":
-    "88ec915ed8519a5b49f1d022774d2655",
+    "e57eca16c0bab569752c6efa709dbd4c",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000002.inc":
-    "4b5290a0c127e1375ec6b5dcec46893c",
+    "3065da896093048aaca0c91835d44672",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndex.comp.00000003.inc":
-    "0d3eb0f82f328837ef4c0fe5f978ef3f",
+    "b81b778b3189a1948b9360c11b31cd1a",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000000.inc":
-    "bb07b6941cee943efaf627da12fab504",
+    "c99dfc31c0c2b7b40df1a9960bdb93a6",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000001.inc":
-    "48de7900fe4d96446a61abcb1b86f0ca",
+    "4afc2391a9b76c08c4c94492edd81237",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndexIndirectLineLoop.comp.00000002.inc":
-    "53475dec809dddaf902dd12253acba19",
+    "64e8fe355fe90b0581346d8326e16318",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertIndirectLineLoop.comp.00000000.inc":
-    "523d3207d424614197ace9601ce56950",
+    "fdba6c025e6e0d552173fae0e6b41e71",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc":
-    "021ad52cea91db420280e4406081e8f2",
+    "ff131714bf88236bff01276e6f6d6afe",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc":
-    "2d618000d8c839338a9faa3c800acbaf",
+    "ac6d32105935093ba8fe9a3af76173ae",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc":
-    "6f02318375b02ce2121cd409f9f0a1bc",
+    "c4827a4f2b4f08534286251c2ac7f3fe",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc":
-    "7d2128cc8962c0e0c4cb03c773ec03bb",
+    "9c5427b20679357827a7a012ef310b36",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc":
-    "199e8d2f931aa43c3dff9aaa9ec26bcd",
+    "019c07cf90844d96e3e9ee540b8d0a0e",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc":
-    "90c8f5720161febcdeea675c083d503b",
+    "1e62f565730506fe64f0688744fa98c8",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc":
-    "dfb6b6e51f6bbb022f592a254ad067a2",
+    "63688e1f8236c15fd9a6cfb559f1691f",
   "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc":
-    "420785373b15743e3a29effe12ccdc4a",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc":
-    "b369a5a2e93b302eeddef0185c55ae02",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc":
-    "9f8a2a28737b4cd354d62873c261e1b4",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc":
-    "ecc200fd8bd6f9054fe7fcd921bcb399",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc":
-    "e20cba5aea8256f6fb9f287d22c6a188",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc":
-    "b17a1b7bfcf94e4e248abd18860c2a34",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc":
-    "3c24f4f3309ce1dadd5802681ee8f680",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc":
-    "f19e58c8b9f1dac479d31f551a92e031",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc":
-    "5a6a7d5cdfd96e45101cd6fe7dc20371",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000010.inc":
-    "6a4da57f0c84d217711b51eea99c061c",
+    "73effde6b90a6722179b86e663ab393a",
   "src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc":
-    "235ca7c3979ce29a49c320d000ee7409",
+    "e120b3678d802559586faa128b1ff464",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc":
-    "5f95bd216ee5a32a5db515e7f581f006",
+    "c4b99765b8d4565414cea7608f71dc8f",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc":
-    "c952154aec29e115169f5003262bab88",
+    "48a9e9d6568fe28498ea6bc3b1718650",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000002.inc":
-    "80f1da58eb3d7bf1a052471779b0fd86",
+    "43f93c9ca99de7dcba16d2c47e98ff9c",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000003.inc":
-    "f5977e1d3406ecf00b87d58c2166dc0a",
+    "580b2cd9c74729571a10de30c661b2db",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000004.inc":
-    "985dbcb4f9c8b507b3f2c7937c147081",
+    "ea511e734bbff95bccbd1ac12c579bb2",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000005.inc":
-    "4c6f5f905d18c9a8160bfa4a63a5737f",
+    "71399da713e4e34232810abacc99bde1",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000006.inc":
-    "f43d11e3c940f0aa4bd12171bb761391",
+    "60e93795f81e1145d5e6f6d2db2c69a0",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000007.inc":
-    "3402f0f460cff8a1c8f8085494a4a66c",
+    "d11768fb8b9a902c9b8f65bdadeaefc6",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000008.inc":
-    "67fcfea754cfd5e4daf500447bde29d7",
+    "3f48b4f5b423c3d37a10cebc895d3ed3",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000009.inc":
-    "1f98b3ac4fd676185a9e6098bcdca0d1",
+    "8bf5cdf9368082cd08ce04d5858a45ba",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000A.inc":
-    "fa7f47eb9e04a5678ab11160b6712ba2",
+    "afa413ae202238995650562038762ffd",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000B.inc":
-    "f4dfbecae4af68541b57b84ff2e5ae99",
+    "7edc46858c6337692e5b8fe020cf335f",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000C.inc":
-    "84299b37c41a7fb781ea0f4e45c4be34",
+    "70edcf3c197b60fac240d69c8448d52f",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000D.inc":
-    "881e75c16ea2fdc4afecf4f020e78554",
+    "3e7c2a3cf7dbc1bde61ef99bd7fbbc26",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000E.inc":
-    "c73dbdd67e3f3a4ece5e8dc022bfe6c0",
+    "f82c41eeed46f764eaa214486abbe450",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.0000000F.inc":
-    "754cf04f2c48d4ab2805c51a7a3d4245",
+    "2baf5629fd01a40e6b6b08ae9458cad7",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000010.inc":
-    "95803c9707b6a4d8b6b47f6fba9611fc",
+    "de234376ffee6b24c7ef1d78410a435a",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000011.inc":
-    "137f044a3e8cc6bfbdbea6ff352941df",
+    "414ed451be3804829f81aaaa233e1080",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000012.inc":
-    "f41fcc56ceea0044788cde89580b2387",
+    "d3a499fa47e53f650a7bfd11c45459e3",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000013.inc":
-    "d3dedff006d0e20acd32239327ee73b8",
+    "9db8756ece8c09df4cccedd2d9c0a2fe",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000014.inc":
-    "9c36d7628aad776a20bf8242274f998b",
+    "409f30b070197b99e9d53ee2105b222c",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000015.inc":
-    "68bdba2f448fb982caa3dea818e4e918",
+    "06dc9a41668634e26a4a534f794c2b10",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000016.inc":
-    "9737b502ccdf9866078b1a84488e50f8",
+    "59e14de5a23d57709300d03ea9f6d4e5",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000017.inc":
-    "9076f714155f6e436c31adc9cd4e1dd6",
+    "3522c2c4f4ef33cdcf26e54800b51d29",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc":
-    "818b38bd23da51a1bbe74082ceafcb1c",
+    "ea8c9038680df0ed7c0104baaa1b0cb5",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc":
-    "7dff574a802d4aef90544e8da8d54d4a",
+    "130806e933a1ca7127d52313fb12bd02",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc":
-    "babf257b8fbdce94c80e23db90b1e5d3",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc":
-    "0e5d89d92f1d1f41f6cc5c519763674b",
+    "25994fafbf3e03eb18c8f281b03c4eb6",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc":
-    "65cc239c9aeb1f4ae6ff82777f7a36c9",
+    "cf8833b74b0314f18ea1c8831445c3e1",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc":
-    "c8068cf825d7559681ede42674c3e3ea",
+    "c2f841990c0377364115ffc986456e55",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000006.inc":
+    "cabbaec7b63254697b6c742dcea3e60a",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc":
-    "f3a6575224a4c95364b62c049ccb57f2",
+    "b37767d7694c8550a6ee3f35a0109d26",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc":
-    "bf0e9031687ee22d94cb1667365b1ca0",
+    "d0568b1b3a1a811a155ea196118f3273",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc":
-    "157eea1b255a9fc13a39d0fed5791582",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc":
-    "b355dcc4b4b6ad4f6e8005497d8445c3",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc":
-    "a25953a03746aac32a73ecec765c5ac5",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc":
-    "c55d9db160a06e72e35f882940a45f21",
+    "7f4ba7d2250a925e29af049bfa641429",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc":
-    "b26e9b2235c5c2de27ba536d09763c81",
+    "212ca35dad0411b5870f706aec7666b6",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc":
-    "36d786b1ab799616cdf9a3bff9ed2252",
+    "ec117c60fdc606402f9cf5b62a3e2bd3",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc":
-    "aec2cf9115e5e3b2367487255d030c17",
-  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc":
-    "f4545c3aaa814bac216d8ae327c5a111",
+    "65f3352e24a0dae6aa4b749a64a5271e",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc":
-    "5bb2d9e8ee68f8ec2dacd4a056f8eff2",
+    "c05a2ea727e8b1a185302fc859e81685",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc":
-    "8152303c7825ff73d9972d95520852dd",
+    "98129fb269baf209c979248541752be5",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000016.inc":
+    "24614e0604007bafecc87375025bbb8b",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000018.inc":
+    "ba3ad74b2debb2dd404c7525006d34ea",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000019.inc":
+    "2067e1c526f458ad13d846c76c4c2be9",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000001A.inc":
+    "e70f3b66ae6d2c6247c411259861370e",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000020.inc":
+    "5b23d65b9c18f15254f60aead37bbfee",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000021.inc":
+    "d680b309a3717fe0176a4154eb829e22",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000022.inc":
+    "d45a46e98764d28135b030bfd1d4ac30",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000024.inc":
+    "215312aba6d446db3d98cf1de0f2e610",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000025.inc":
+    "a772b28c5abf457ced37e56b6e308449",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000026.inc":
+    "9774941dedf7a80b234f3bd10c288cc6",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000028.inc":
+    "ecccb4179bd02aefe9654d1c8e1bf2d0",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000029.inc":
+    "9f02086d74cfb076c2b7c655c5b627b2",
+  "src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000002A.inc":
+    "4b24881665a56f47d541273d18b6f121",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000000.inc":
-    "1dc870604216818c7ca757ebb7cd22bc",
+    "c0c376dccc2d40e8f8bbdb1a10215a5d",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000001.inc":
-    "cb05ee0936a2235f49994497bd831b20",
+    "99f6172f96f9d46713461f477e350c55",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000002.inc":
-    "9c6973f0e4035a411de5425d48a8ded5",
+    "7fdbcbe42a999ef2066d2d43c42c0e0c",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000003.inc":
-    "93a50e9365cef6be89033df687db44ad",
+    "fd45b8c72ac8ed04aba7b0eab60e1955",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000004.inc":
-    "78e697d35c094a750a6cb6689b9d35c4",
+    "3e1f3b7a905d9df0f0fce72d1cb4de1f",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayCull.comp.00000005.inc":
-    "5c57c4cb2507aee3e7d0d53555ef7471",
+    "17ac0d27525577a0c29f8d3318b4779b",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.comp.00000000.inc":
-    "a341905ac08458eab61199817fe40c7e",
+    "28bc37bb8d85bdef0637b2494bf95878",
   "src/libANGLE/renderer/vulkan/shaders/gen/OverlayDraw.comp.00000001.inc":
-    "25ba613bf71f7c1397bfe2d089d57ac6",
+    "e8f6cb0fb7ef82da8c7246179e460a2d",
   "src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag":
-    "a3ecba7bc86093f90b183605bed82813",
+    "e47ecdcabdecde4b71eb3f27af50e3ea",
+  "src/libANGLE/renderer/vulkan/shaders/src/BlitResolve.frag.json":
+    "353929c45304fe9c327b50a53c5f1918",
   "src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp":
     "3080e264f932ce3a219bb63c79b86636",
+  "src/libANGLE/renderer/vulkan/shaders/src/BlitResolveStencilNoExport.comp.json":
+    "8a3e9ff34eba0386edb98048547a272b",
   "src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp":
     "b7c20e019199f8328ef37b11c6fbcadd",
+  "src/libANGLE/renderer/vulkan/shaders/src/BufferUtils.comp.json":
+    "289022611e8fe6742221ed371cbd6b36",
   "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp":
     "a46b48d7d5b19c74eb377f275525ab8d",
+  "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndex.comp.json":
+    "22b04129fc4a3db7dbd62adeda18577b",
   "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp":
     "ee94f2dab39583c17cb5739199229427",
+  "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndexIndirectLineLoop.comp.json":
+    "f5f3eb40d8423e1027c2d47197b8f9d2",
   "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp":
     "c4fe0f463b41cd59bae33f9711e0b67b",
+  "src/libANGLE/renderer/vulkan/shaders/src/ConvertIndirectLineLoop.comp.json":
+    "c2c79c40b0fbcb4876637aa06e8aa919",
   "src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp":
-    "e0967dcc25d76797864dd5c0ab9847ce",
+    "f63e7c4f738c11f1a1b19023d4515dc4",
+  "src/libANGLE/renderer/vulkan/shaders/src/ConvertVertex.comp.json":
+    "e4a95aae7f216780946e7332d22aa74e",
   "src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert":
     "805ec8b2f87d4bd4242dc5b1c58ba3b4",
   "src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag":
     "8889ae8014a657a0efd5607954126945",
+  "src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag.json":
+    "f3e0afbc2368002e8a1148edcbe709fa",
   "src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag":
-    "f0f3cc82d78198f114b698e1aea31267",
+    "900796c40d8494da9d78a6c3fa53aea4",
+  "src/libANGLE/renderer/vulkan/shaders/src/ImageCopy.frag.json":
+    "f6b69ba316a5565400c2875e5da14b73",
   "src/libANGLE/renderer/vulkan/shaders/src/OverlayCull.comp":
     "c89a0d185f7723e0c221c135aa4f48a3",
+  "src/libANGLE/renderer/vulkan/shaders/src/OverlayCull.comp.json":
+    "e5fd5bb63707753601e197635316430e",
   "src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.comp":
     "dcc246b398b2e07a869a264666499362",
+  "src/libANGLE/renderer/vulkan/shaders/src/OverlayDraw.comp.json":
+    "af79e5153c99cdb1e6b551b11bbf7f6b",
   "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.cpp":
-    "7a38442f63d6fb7b931390d3776cc964",
+    "ff29debe33758511b793e4eee2a70061",
   "src/libANGLE/renderer/vulkan/vk_internal_shaders_autogen.h":
-    "3eea961399cc31bedac5128770d5175d",
+    "f2b4a6af004d1f0f06b01e370c202878",
   "tools/glslang/glslang_validator.exe.sha1":
-    "289f30598865a987a21b79ae525fc66f",
+    "17e862cc6f462fecbf50b24ed6544a27",
   "tools/glslang/glslang_validator.sha1":
-    "f3d7af9fa1191a3719f2606ef47650ef"
+    "c9a8437b51fdf7c106bd19ecb4ab552f"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json b/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
index 36f04c3e02d..311617d4e36 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
@@ -8,5 +8,5 @@
   "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
     "8bfd8a3857c2b9062d7ada46c7d27bcf",
   "third_party/vulkan-headers/src/registry/vk.xml":
-    "f48f0bee41017fb21c4f69f29d1a2b7a"
+    "45523fd33dd2d1dea4f97db433131b9e"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/packed_enum.json b/chromium/third_party/angle/scripts/code_generation_hashes/packed_enum.json
index ce0017f824e..ce6a69592d5 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/packed_enum.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/packed_enum.json
@@ -4,13 +4,13 @@
   "src/common/PackedEGLEnums_autogen.h":
     "085d82d2003f02345abc4986523127d4",
   "src/common/PackedGLEnums_autogen.cpp":
-    "8fceeabaa8a96d0f0b2034e2c56ff597",
+    "dfd979452806f59fff27dde8ffe8e300",
   "src/common/PackedGLEnums_autogen.h":
-    "9baa6356c86dfbf72380539698b55590",
+    "8466493b646665844ac579e997ebb6ca",
   "src/common/gen_packed_gl_enums.py":
     "b3e96ea44f52ec23ee893bd843dfd2cb",
   "src/common/packed_egl_enums.json":
     "76e1b814421e121164d60a0d89cb16c1",
   "src/common/packed_gl_enums.json":
-    "fbe589dc6c790f0df47e30a4bf0a48ea"
+    "5ed701940bc80450631f8886d585ef8a"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/proc_table.json b/chromium/third_party/angle/scripts/code_generation_hashes/proc_table.json
index e48b2adba13..cf9d750134c 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/proc_table.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/proc_table.json
@@ -2,19 +2,19 @@
   "scripts/egl.xml":
     "842e24514c4cfe09fba703c17a0fd292",
   "scripts/egl_angle_ext.xml":
-    "854e99785af19f8f4eea4f73005a0451",
+    "087d6a3996a91fbb0b664cac57c50c4c",
   "scripts/gen_proc_table.py":
-    "24dbcc78fd3f000f58ca98237ccc0da4",
+    "05587426d508d13eec257c4e5f3a0a13",
   "scripts/gl.xml":
     "e74a595068cbdd6064300be1e71b7cc9",
   "scripts/gl_angle_ext.xml":
     "079cc4829de7ce638faf7bbf66e141ad",
   "scripts/registry_xml.py":
-    "b2902e02f495a9cc85082c47e7b73ac9",
+    "f45ffbc8a3c8a7144c2e98e19d1127a0",
   "scripts/wgl.xml":
     "aa96419c582af2f6673430e2847693f4",
   "src/libGL/proc_table_wgl_autogen.cpp":
-    "03c05f20c57c1de822b0ddaf6d4f9607",
+    "253f59ef3aa9ccfcab1364ae5101dbe2",
   "src/libGLESv2/proc_table_egl_autogen.cpp":
-    "0154d2734e6d89520d3697890df2164e"
+    "289be4d639a17429af8f41d53e9c1d0e"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/restricted_traces.json b/chromium/third_party/angle/scripts/code_generation_hashes/restricted_traces.json
index 39f145394ee..4187c2c2d20 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/restricted_traces.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/restricted_traces.json
@@ -1,16 +1,24 @@
 {
+  "src/tests/perf_tests/restricted_traces/angry_birds_2_1500.tar.gz.sha1":
+    "f289d1836514a3ced7c166186df43204",
+  "src/tests/perf_tests/restricted_traces/candy_crush_500.tar.gz.sha1":
+    "ef00d8872fe818250df07f761d440bfb",
+  "src/tests/perf_tests/restricted_traces/egypt_1500.tar.gz.sha1":
+    "e675648c5b16fc52077998621e6300ba",
   "src/tests/perf_tests/restricted_traces/gen_restricted_traces.py":
-    "f61ccd2c8ce98674527909d567083963",
+    "aa5043eaa7ba7d620ff2a3b40d67bae2",
   "src/tests/perf_tests/restricted_traces/manhattan_10.tar.gz.sha1":
-    "b4d333cd5cf3977c339350be0a819928",
+    "7f5e3e8b4d7ec07232c54d41964006ea",
   "src/tests/perf_tests/restricted_traces/restricted_traces.json":
-    "c0a96b33aa1b88197e956d1848aa36b3",
+    "de1d1c2086bd4f5249f5bdbdf0d2a854",
   "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.gni":
-    "c098dd718bab70e9f09ef955ddfb6d05",
+    "25de059705d29d797e246aae027498ec",
   "src/tests/perf_tests/restricted_traces/restricted_traces_autogen.h":
-    "9caa6c37d60ca1d69a7d0d71749a88bb",
+    "68a11667d674549018cf06e1a759c383",
+  "src/tests/perf_tests/restricted_traces/subway_surfer_500.tar.gz.sha1":
+    "a47a797dd227f5025439b47cee80dbc9",
   "src/tests/perf_tests/restricted_traces/temple_run_300.tar.gz.sha1":
-    "934983876ac5f3d9bc9b43698bb94b9d",
+    "e912c0a0e93efe73088211d63b4a30af",
   "src/tests/perf_tests/restricted_traces/trex_200.tar.gz.sha1":
-    "605cf71846da2309a002baa78abf28e1"
+    "b4357f6a2205ada41597437a4fa9bbab"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/code_generation_hashes/uniform_type.json b/chromium/third_party/angle/scripts/code_generation_hashes/uniform_type.json
index 872fb7b07bf..185e6504949 100644
--- a/chromium/third_party/angle/scripts/code_generation_hashes/uniform_type.json
+++ b/chromium/third_party/angle/scripts/code_generation_hashes/uniform_type.json
@@ -1,6 +1,6 @@
 {
   "src/common/gen_uniform_type_table.py":
-    "f7a7846f21da3406f79dcd9a4cb394e8",
+    "43f21df292ca1864166cc93ed59f2b66",
   "src/common/uniform_type_info_autogen.cpp":
-    "417dddc7510f3d3fa71345f8838e323e"
+    "ecffb0755d6051d656f9b68e3d7eea72"
 }
\ No newline at end of file
diff --git a/chromium/third_party/angle/scripts/egl_angle_ext.xml b/chromium/third_party/angle/scripts/egl_angle_ext.xml
index 7206573b221..d164b16d67f 100644
--- a/chromium/third_party/angle/scripts/egl_angle_ext.xml
+++ b/chromium/third_party/angle/scripts/egl_angle_ext.xml
@@ -94,6 +94,20 @@
             <param><ptype>EGLSurface</ptype> <name>surface</name></param>
             <param><ptype>EGLFrameTokenANGLE</ptype> <name>frametoken</name></param>
         </command>
+        <command>
+            <proto><pytpe>void</pytpe> <name>eglReleaseHighPowerGPUANGLE</name></proto>
+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
+        </command>
+        <command>
+            <proto><pytpe>void</pytpe> <name>eglReacquireHighPowerGPUANGLE</name></proto>
+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
+            <param><ptype>EGLContext</ptype> <name>ctx</name></param>
+        </command>
+        <command>
+            <proto><pytpe>void</pytpe> <name>eglHandleGPUSwitchANGLE</name></proto>
+            <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
+        </command>
     </commands>
     <!-- SECTION: ANGLE extension interface definitions -->
     <extensions>
@@ -138,5 +152,12 @@
                 <command name="eglSwapBuffersWithFrameTokenANGLE"/>
             </require>
         </extension>
+        <extension name="EGL_ANGLE_power_preference" supported="egl">
+            <require>
+                <command name="eglReleaseHighPowerGPUANGLE"/>
+                <command name="eglReacquireHighPowerGPUANGLE"/>
+                <command name="eglHandleGPUSwitchANGLE"/>
+            </require>
+        </extension>
     </extensions>
 </registry>
diff --git a/chromium/third_party/angle/scripts/export_targets.py b/chromium/third_party/angle/scripts/export_targets.py
index 4ff9aae488e..dccf6e8d4bb 100755
--- a/chromium/third_party/angle/scripts/export_targets.py
+++ b/chromium/third_party/angle/scripts/export_targets.py
@@ -187,7 +187,7 @@ IGNORED_INCLUDES = {
     b'libANGLE/renderer/gl/eagl/DisplayEAGL.h',
     b'libANGLE/renderer/gl/egl/android/DisplayAndroid.h',
     b'libANGLE/renderer/gl/egl/DisplayEGL.h',
-    b'libANGLE/renderer/gl/egl/ozone/DisplayOzone.h',
+    b'libANGLE/renderer/gl/egl/gbm/DisplayGbm.h',
     b'libANGLE/renderer/gl/glx/DisplayGLX.h',
     b'libANGLE/renderer/gl/wgl/DisplayWGL.h',
     b'libANGLE/renderer/metal/DisplayMtl_api.h',
@@ -223,6 +223,7 @@ IGNORED_DIRECTORIES = {
     '//third_party/vulkan-loader',
     '//third_party/vulkan-tools',
     '//third_party/vulkan-validation-layers',
+    '//third_party/zlib',
 }
 
 def has_all_includes(target_name: str, descs: dict) -> bool:
diff --git a/chromium/third_party/angle/scripts/gen_proc_table.py b/chromium/third_party/angle/scripts/gen_proc_table.py
index 3dbfa523631..13f45f69752 100644
--- a/chromium/third_party/angle/scripts/gen_proc_table.py
+++ b/chromium/third_party/angle/scripts/gen_proc_table.py
@@ -37,11 +37,11 @@ template_cpp = """// GENERATED FILE - DO NOT EDIT.
 
 namespace {namespace}
 {{
-ProcEntry g_procTable[] = {{
+const ProcEntry g_procTable[] = {{
 {proc_data}
 }};
 
-size_t g_numProcs = {num_procs};
+const size_t g_numProcs = {num_procs};
 }}  // namespace {namespace}
 """
 
@@ -55,7 +55,7 @@ includes_gles = """#include "libGLESv2/proc_table_egl.h"
 #include "libGLESv2/entry_points_gles_3_1_autogen.h"
 #include "libGLESv2/entry_points_gles_3_2_autogen.h"
 #include "libGLESv2/entry_points_gles_ext_autogen.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 """
 
 includes_gl = """#include "libGL/proc_table_wgl.h"
@@ -80,7 +80,7 @@ includes_gl = """#include "libGL/proc_table_wgl.h"
 #include "libGL/entry_points_gl_4_4_autogen.h"
 #include "libGL/entry_points_gl_4_5_autogen.h"
 #include "libGL/entry_points_gl_4_6_autogen.h"
-#include "platform/Platform.h"
+#include "platform/PlatformMethods.h"
 """
 
 sys.path.append('../src/libANGLE/renderer')
diff --git a/chromium/third_party/angle/scripts/generate_android_bp.py b/chromium/third_party/angle/scripts/generate_android_bp.py
index 1a521881c6c..cc4cd07d54d 100644
--- a/chromium/third_party/angle/scripts/generate_android_bp.py
+++ b/chromium/third_party/angle/scripts/generate_android_bp.py
@@ -492,7 +492,6 @@ def main():
         'defaults': ['ANGLE_java_defaults'],
         'static_libs': ['ANGLE_library'],
         'manifest': 'src/android_system_settings/src/com/android/angle/AndroidManifest.xml',
-        'required': ['privapp_whitelist_com.android.angle'],
     }))
 
     output = [
diff --git a/chromium/third_party/angle/scripts/registry_xml.py b/chromium/third_party/angle/scripts/registry_xml.py
index 9748e31a4b7..3d1f2347b68 100644
--- a/chromium/third_party/angle/scripts/registry_xml.py
+++ b/chromium/third_party/angle/scripts/registry_xml.py
@@ -86,6 +86,7 @@ gles_extensions = [
     "GL_EXT_texture_compression_rgtc",
     "GL_EXT_texture_compression_s3tc",
     "GL_EXT_texture_compression_s3tc_srgb",
+    "GL_EXT_texture_cube_map_array",
     "GL_EXT_texture_filter_anisotropic",
     "GL_EXT_texture_format_BGRA8888",
     "GL_EXT_texture_storage",
@@ -103,6 +104,7 @@ gles_extensions = [
     "GL_OES_mapbuffer",
     "GL_OES_texture_3D",
     "GL_OES_texture_border_clamp",
+    "GL_OES_texture_cube_map_array",
     "GL_OES_texture_half_float",
     "GL_OES_texture_storage_multisample_2d_array",
     "GL_OES_vertex_array_object",
@@ -124,6 +126,7 @@ supported_egl_extensions = [
     "EGL_ANGLE_device_d3d",
     "EGL_ANGLE_feature_control",
     "EGL_ANGLE_ggp_stream_descriptor",
+    "EGL_ANGLE_power_preference",
     "EGL_ANGLE_program_cache_control",
     "EGL_ANGLE_query_surface_pointer",
     "EGL_ANGLE_stream_producer_d3d_texture",
diff --git a/chromium/third_party/angle/scripts/roll_aosp.sh b/chromium/third_party/angle/scripts/roll_aosp.sh
index 819974e286e..43a80e7e330 100755
--- a/chromium/third_party/angle/scripts/roll_aosp.sh
+++ b/chromium/third_party/angle/scripts/roll_aosp.sh
@@ -14,10 +14,20 @@ deps=(
     "third_party/jsoncpp"
     "third_party/jsoncpp/source"
     "third_party/vulkan_memory_allocator"
+    "third_party/zlib"
+)
+
+# Only add the parts of NDK that are required by ANGLE. The entire dep is too large.
+delete_only_deps=(
+    "third_party/android_ndk"
+)
+
+add_only_deps=(
+    "third_party/android_ndk/sources/android/cpufeatures"
 )
 
 # Delete dep directories so that gclient can check them out
-for dep in ${deps[@]}; do
+for dep in ${deps[@]} ${delete_only_deps[@]}; do
     rm -rf $dep
 done
 
@@ -66,22 +76,27 @@ git add Android.bp
 
 # Delete the .git files in each dep so that it can be added to this repo. Some deps like jsoncpp
 # have multiple layers of deps so delete everything before adding them.
-for dep in ${deps[@]}; do
+for dep in ${deps[@]} ${delete_only_deps[@]}; do
     rm -rf $dep/.git
 done
 
 extra_removal_files=(
-    # The jsoncpp OWNERS and VulkanMemoryAllocator file contains users that have not logged into
-    # the Android gerrit so it fails to upload.
+    # Some third_party deps have OWNERS files which contains users that have not logged into
+    # the Android gerrit. Repo cannot upload with these files present.
     "third_party/jsoncpp/OWNERS"
     "third_party/vulkan_memory_allocator/OWNERS"
+    "third_party/zlib/OWNERS"
+    "third_party/zlib/google/OWNERS"
+    "third_party/zlib/contrib/tests/OWNERS"
+    "third_party/zlib/contrib/bench/OWNERS"
+    "third_party/zlib/contrib/tests/fuzzers/OWNERS"
 )
 
 for removal_file in ${extra_removal_files[@]}; do
     rm $removal_file
 done
 
-for dep in ${deps[@]}; do
+for dep in ${deps[@]} ${add_only_deps[@]}; do
     git add -f $dep
 done
 
diff --git a/chromium/third_party/angle/scripts/trigger.py b/chromium/third_party/angle/scripts/trigger.py
index f343dbcf082..0afe6a3f8c4 100644
--- a/chromium/third_party/angle/scripts/trigger.py
+++ b/chromium/third_party/angle/scripts/trigger.py
@@ -25,47 +25,6 @@ def parse_args():
     return parser.parse_known_args()
 
 
-# Taken from:
-# https://chromium.googlesource.com/chromium/src/tools/mb/+/2192df66cd0ed214bcfbfd387ad0c5c8c0a21eb1/mb.py#586
-def add_base_software(swarming_args):
-    # HACK(iannucci): These packages SHOULD NOT BE HERE.
-    # Remove method once Swarming Pool Task Templates are implemented.
-    # crbug.com/812428
-
-    # Add in required base software. This should be kept in sync with the
-    # `chromium_swarming` recipe module in build.git. All references to
-    # `swarming_module` below are purely due to this.
-    cipd_packages = [
-        ('infra/python/cpython/${platform}', 'version:2.7.15.chromium14'),
-        ('infra/tools/luci/logdog/butler/${platform}',
-         'git_revision:e1abc57be62d198b5c2f487bfb2fa2d2eb0e867c'),
-        ('infra/tools/luci/vpython-native/${platform}',
-         'git_revision:e317c7d2c17d4c3460ee37524dfce4e1dee4306a'),
-        ('infra/tools/luci/vpython/${platform}',
-         'git_revision:e317c7d2c17d4c3460ee37524dfce4e1dee4306a'),
-    ]
-
-    for pkg, vers in cipd_packages:
-        swarming_args.append('--cipd-package=.swarming_module:%s=%s' % (pkg, vers))
-
-    # Add packages to $PATH
-    swarming_args.extend([
-        '--env-prefix',
-        'PATH=.swarming_module',
-        '--env-prefix',
-        'PATH=.swarming_module/bin',
-    ])
-
-    # Add cache directives for vpython.
-    vpython_cache_path = '.swarming_module_cache/vpython'
-    swarming_args.extend([
-        '--named-cache',
-        'swarming_module_cache_vpython=' + vpython_cache_path,
-        '--env-prefix',
-        'VPYTHON_VIRTUALENV_ROOT=' + vpython_cache_path,
-    ])
-
-
 def main():
     args, unknown = parse_args()
     path = args.gn_path.replace('\\', '/')
@@ -96,8 +55,6 @@ def main():
         '-d', 'gpu=' + args.gpu_dim, '-s', sha
     ]
 
-    add_base_software(swarming_args)
-
     for i in range(args.shards):
         shard_args = swarming_args[:]
         shard_args.extend([