Roll ANGLE from 64e979400646 to 0d1dab2cf11b (3 revisions)

https://chromium.googlesource.com/angle/angle.git/+log/64e979400646..0d1dab2cf11b

Please enable autosubmit on changes if possible when approving them.

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-android-autoroll
Please CC angle-team@google.com,rmistry@google.com,ynovikov@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Bug: b/315836169
Bug: b/324953979
Bug: b/335937565
Change-Id: I7e01faedb49eedfb0a587a3dee20fa18256c0806

30 files changed, 269 insertions, 139 deletions

diff --git a/DEPS b/DEPS
index 56f64638c8..fb2663d35c 100644
--- a/DEPS
+++ b/DEPS
@@ -938,7 +938,7 @@ deps = {
   },
 
   'third_party/vulkan-deps': {
-    'url': Var('chromium_git') + '/vulkan-deps@36da75a01950ce86a9525f7c080359710c0ee6b4',
+    'url': Var('chromium_git') + '/vulkan-deps@91b20c9cf5fdc217e4adca8ed051e4be4bb26135',
     'condition': 'not build_with_chromium',
   },
 
diff --git a/include/platform/autogen/FeaturesVk_autogen.h b/include/platform/autogen/FeaturesVk_autogen.h
index a777a41037..200f0f021f 100644
--- a/include/platform/autogen/FeaturesVk_autogen.h
+++ b/include/platform/autogen/FeaturesVk_autogen.h
@@ -1300,13 +1300,6 @@ struct FeaturesVk : FeatureSetBase
         &members, "https://issuetracker.google.com/288119108"
     };
 
-    FeatureInfo requireCachedBitForStagingBuffer = {
-        "requireCachedBitForStagingBuffer",
-        FeatureCategory::VulkanWorkarounds,
-        "use cached bit as required bit instead of preferred bit for staging buffers",
-        &members, "https://issuetracker.google.com/315836169"
-    };
-
     FeatureInfo supportsExternalFormatResolve = {
         "supportsExternalFormatResolve",
         FeatureCategory::VulkanFeatures,
diff --git a/include/platform/vk_features.json b/include/platform/vk_features.json
index e6dd0a2cdd..0315ffbc9c 100644
--- a/include/platform/vk_features.json
+++ b/include/platform/vk_features.json
@@ -1417,14 +1417,6 @@
             "issue": "https://issuetracker.google.com/288119108"
         },
         {
-            "name": "require_cached_bit_for_staging_buffer",
-            "category": "Workarounds",
-            "description": [
-                "use cached bit as required bit instead of preferred bit for staging buffers"
-            ],
-            "issue": "https://issuetracker.google.com/315836169"
-        },
-        {
             "name": "supports_external_format_resolve",
             "category": "Features",
             "description": [
diff --git a/src/compiler/translator/msl/Name.cpp b/src/compiler/translator/msl/Name.cpp
index 9dc3b5481a..7faed0f5ba 100644
--- a/src/compiler/translator/msl/Name.cpp
+++ b/src/compiler/translator/msl/Name.cpp
@@ -96,13 +96,9 @@ void Name::emitImpl(T &out) const
             {
                 out << mRawName;
             }
-            else if (mRawName[0] != '_')
-            {
-                out << kAngleInternalPrefix << '_' << mRawName;
-            }
             else
             {
-                out << kAngleInternalPrefix << mRawName;
+                out << kAngleInternalPrefix << '_' << mRawName;
             }
             break;
 
diff --git a/src/compiler/translator/msl/TranslatorMSL.cpp b/src/compiler/translator/msl/TranslatorMSL.cpp
index 73fb34d17f..06d309e1ad 100644
--- a/src/compiler/translator/msl/TranslatorMSL.cpp
+++ b/src/compiler/translator/msl/TranslatorMSL.cpp
@@ -520,7 +520,7 @@ void AddFragDepthEXTDeclaration(TCompiler &compiler, TIntermBlock &root, TSymbol
         // EXT_blend_func_extended usage, the exact variable may be unknown until the
         // program is linked.
         TVariable *alpha0 =
-            new TVariable(&symbolTable, sh::ImmutableString("_ALPHA0"),
+            new TVariable(&symbolTable, sh::ImmutableString("ALPHA0"),
                           StaticType::Get<EbtFloat, EbpUndefined, EvqSpecConst, 1, 1>(),
                           SymbolType::AngleInternal);
 
diff --git a/src/libANGLE/renderer/vulkan/BufferVk.cpp b/src/libANGLE/renderer/vulkan/BufferVk.cpp
index af74c7b6b2..c21477759b 100644
--- a/src/libANGLE/renderer/vulkan/BufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/BufferVk.cpp
@@ -584,16 +584,18 @@ angle::Result BufferVk::handleDeviceLocalBufferMap(ContextVk *contextVk,
                                                    VkDeviceSize size,
                                                    uint8_t **mapPtr)
 {
+    vk::Renderer *renderer = contextVk->getRenderer();
     ANGLE_TRY(
         allocStagingBuffer(contextVk, vk::MemoryCoherency::CachedPreferCoherent, size, mapPtr));
-    ANGLE_TRY(mStagingBuffer.invalidate(contextVk->getRenderer()));
 
     // Copy data from device local buffer to host visible staging buffer.
     VkBufferCopy copyRegion = {mBuffer.getOffset() + offset, mStagingBuffer.getOffset(), size};
     ANGLE_TRY(CopyBuffers(contextVk, &mBuffer, &mStagingBuffer, 1, &copyRegion));
     ANGLE_TRY(mStagingBuffer.waitForIdle(contextVk, "GPU stall due to mapping device local buffer",
                                          RenderPassClosureReason::DeviceLocalBufferMap));
-    // Because the buffer is coherent, no need to call invalidate here.
+    // Since coherent is prefer, we may end up getting non-coherent. Always call invalidate here (it
+    // will check memory flag before it actually calls into driver).
+    ANGLE_TRY(mStagingBuffer.invalidate(renderer));
 
     return angle::Result::Continue;
 }
diff --git a/src/libANGLE/renderer/vulkan/TextureVk.cpp b/src/libANGLE/renderer/vulkan/TextureVk.cpp
index 7f272cd817..baa66a1410 100644
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -2142,6 +2142,8 @@ angle::Result TextureVk::copyImageDataToBufferAndGetData(ContextVk *contextVk,
 
     // Explicitly finish. If new use cases arise where we don't want to block we can change this.
     ANGLE_TRY(contextVk->finishImpl(reason));
+    // invalidate must be called after wait for finish.
+    ANGLE_TRY(copyBuffer->invalidate(contextVk->getRenderer()));
 
     return angle::Result::Continue;
 }
@@ -2594,6 +2596,8 @@ angle::Result TextureVk::reinitImageAsRenderable(ContextVk *contextVk, const vk:
         // Explicitly finish. If new use cases arise where we don't want to block we can change
         // this.
         ANGLE_TRY(contextVk->finishImpl(RenderPassClosureReason::TextureReformatToRenderable));
+        // invalidate must be called after wait for finish.
+        ANGLE_TRY(srcBuffer->invalidate(renderer));
 
         size_t dstBufferSize = sourceBox.width * sourceBox.height * sourceBox.depth *
                                dstFormat.pixelBytes * layerCount;
diff --git a/src/libANGLE/renderer/vulkan/vk_helpers.cpp b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
index 08f5e0b0b5..c9b393b03d 100644
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
@@ -9809,7 +9809,6 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk,
     ANGLE_TRY(contextVk->initBufferForImageCopy(dstBuffer, bufferSize,
                                                 MemoryCoherency::CachedPreferCoherent,
                                                 imageFormat.id, &dstOffset, outDataPtr));
-    ANGLE_TRY(dstBuffer->invalidate(contextVk->getRenderer()));
     VkBuffer bufferHandle = dstBuffer->getBuffer().getHandle();
 
     LevelIndex sourceLevelVk = toVkLevel(sourceLevelGL);
@@ -10479,7 +10478,6 @@ angle::Result ImageHelper::readPixelsImpl(ContextVk *contextVk,
     ANGLE_TRY(contextVk->initBufferForImageCopy(stagingBuffer, allocationSize,
                                                 MemoryCoherency::CachedPreferCoherent,
                                                 readFormat->id, &stagingOffset, &readPixelBuffer));
-    ANGLE_TRY(stagingBuffer->invalidate(renderer));
     VkBuffer bufferHandle = stagingBuffer->getBuffer().getHandle();
 
     VkBufferImageCopy region = {};
@@ -10514,6 +10512,8 @@ angle::Result ImageHelper::readPixelsImpl(ContextVk *contextVk,
 
     // Triggers a full finish.
     ANGLE_TRY(contextVk->finishImpl(RenderPassClosureReason::GLReadPixels));
+    // invalidate must be called after wait for finish.
+    ANGLE_TRY(stagingBuffer->invalidate(renderer));
 
     return packReadPixelBuffer(contextVk, area, packPixelsParams, getActualFormat(), *readFormat,
                                readPixelBuffer, levelGL, pixels);
diff --git a/src/libANGLE/renderer/vulkan/vk_renderer.cpp b/src/libANGLE/renderer/vulkan/vk_renderer.cpp
index 25523687cd..1f6dcc96c8 100644
--- a/src/libANGLE/renderer/vulkan/vk_renderer.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_renderer.cpp
@@ -2117,16 +2117,8 @@ angle::Result Renderer::initializeMemoryAllocator(vk::Context *context)
 
     // Cached coherent staging buffer.  Note coherent is preferred but not required, which means we
     // may get non-coherent memory type.
-    if (getFeatures().requireCachedBitForStagingBuffer.enabled)
-    {
-        requiredFlags  = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
-        preferredFlags = VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-    }
-    else
-    {
-        requiredFlags  = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
-        preferredFlags = VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
-    }
+    requiredFlags  = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+    preferredFlags = VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
     ANGLE_VK_TRY(context,
                  mAllocator.findMemoryTypeIndexForBufferInfo(
                      createInfo, requiredFlags, preferredFlags, persistentlyMapped,
@@ -4676,11 +4668,6 @@ void Renderer::initFeatures(const vk::ExtensionNameList &deviceExtensionNames,
         &mFeatures, preferDeviceLocalMemoryHostVisible,
         canPreferDeviceLocalMemoryHostVisible(mPhysicalDeviceProperties.deviceType));
 
-    // For some reason, if we use cached staging buffer for read pixels, a lot of tests fail on ARM,
-    // even though we do have invlaid() call there. Temporary keep the old behavior for ARM until we
-    // can root cause it.
-    ANGLE_FEATURE_CONDITION(&mFeatures, requireCachedBitForStagingBuffer, !isARM && !isPowerVR);
-
     // Multiple dynamic state issues on ARM have been fixed.
     // http://issuetracker.google.com/285124778
     // http://issuetracker.google.com/285196249
diff --git a/src/tests/gl_tests/GLSLTest.cpp b/src/tests/gl_tests/GLSLTest.cpp
index fde319d879..58feeaf77b 100644
--- a/src/tests/gl_tests/GLSLTest.cpp
+++ b/src/tests/gl_tests/GLSLTest.cpp
@@ -19231,6 +19231,66 @@ Foo foo(float bar)
     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
 }
 
+// Test that underscores in array names work with out arrays.
+TEST_P(GLSLTest_ES3, UnderscoresWorkWithOutArrays)
+{
+    GLuint fbo;
+    glGenFramebuffers(1, &fbo);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
+
+    GLuint textures[4];
+    glGenTextures(4, textures);
+
+    for (size_t texIndex = 0; texIndex < ArraySize(textures); texIndex++)
+    {
+        glBindTexture(GL_TEXTURE_2D, textures[texIndex]);
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, getWindowWidth(), getWindowHeight(), 0, GL_RGBA,
+                     GL_UNSIGNED_BYTE, nullptr);
+    }
+
+    GLint maxDrawBuffers;
+    glGetIntegerv(GL_MAX_DRAW_BUFFERS, &maxDrawBuffers);
+    ASSERT_GE(maxDrawBuffers, 4);
+
+    GLuint readFramebuffer;
+    glGenFramebuffers(1, &readFramebuffer);
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, readFramebuffer);
+
+    constexpr char kFS[] = R"(#version 300 es
+precision highp float;
+out vec4 _e[4];
+void main()
+{
+    _e[0] = vec4(1.0, 0.0, 0.0, 1.0);
+    _e[1] = vec4(0.0, 1.0, 0.0, 1.0);
+    _e[2] = vec4(0.0, 0.0, 1.0, 1.0);
+    _e[3] = vec4(1.0, 1.0, 1.0, 1.0);
+}
+)";
+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), kFS);
+    GLenum allBufs[4] = {GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2,
+                         GL_COLOR_ATTACHMENT3};
+    constexpr GLuint kMaxBuffers = 4;
+    // Enable all draw buffers.
+    for (GLuint texIndex = 0; texIndex < kMaxBuffers; texIndex++)
+    {
+        glBindTexture(GL_TEXTURE_2D, textures[texIndex]);
+        glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + texIndex, GL_TEXTURE_2D,
+                               textures[texIndex], 0);
+        glFramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + texIndex, GL_TEXTURE_2D,
+                               textures[texIndex], 0);
+    }
+    glDrawBuffers(kMaxBuffers, allBufs);
+
+    // Draw with simple program.
+    drawQuad(program, essl3_shaders::PositionAttrib(), 0.5f, 1.0f, true);
+    ASSERT_GL_NO_ERROR();
+    verifyAttachment2DColor(0, textures[0], GL_TEXTURE_2D, 0, GLColor::red);
+    verifyAttachment2DColor(1, textures[1], GL_TEXTURE_2D, 0, GLColor::green);
+    verifyAttachment2DColor(2, textures[2], GL_TEXTURE_2D, 0, GLColor::blue);
+    verifyAttachment2DColor(3, textures[3], GL_TEXTURE_2D, 0, GLColor::white);
+}
+
 }  // anonymous namespace
 
 ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(
diff --git a/third_party/vulkan-deps/DEPS b/third_party/vulkan-deps/DEPS
index 22211c12a8..40f965c0be 100644
--- a/third_party/vulkan-deps/DEPS
+++ b/third_party/vulkan-deps/DEPS
@@ -10,7 +10,7 @@ vars = {
   'chromium_git': 'https://chromium.googlesource.com',
 
   # Current revision of glslang, the Khronos SPIRV compiler.
-  'glslang_revision': '68df2230566b02c6495ffd8c200db523392fa797',
+  'glslang_revision': 'b9b8fd917b195f680a1ce3f3f663c03e1c82579d',
 
   # Current revision of spirv-cross, the Khronos SPIRV cross compiler.
   'spirv_cross_revision': 'b8fcf307f1f347089e3c46eb4451d27f32ebc8d3',
@@ -19,13 +19,13 @@ vars = {
   'spirv_headers_revision': '4f7b471f1a66b6d06462cd4ba57628cc0cd087d7',
 
   # Current revision of SPIRV-Tools for Vulkan.
-  'spirv_tools_revision': 'dadb3012d51702cccae71967f9f2acaec8f393d5',
+  'spirv_tools_revision': 'dd4b663e13c07fea4fbb3f70c1c91c86731099f7',
 
   # Current revision of Khronos Vulkan-Headers.
   'vulkan_headers_revision': 'eaa319dade959cb61ed2229c8ea42e307cc8f8b3',
 
   # Current revision of Khronos Vulkan-Loader.
-  'vulkan_loader_revision': 'f0c17604ed4a0420f10a76254ee5d034d5f8bd0e',
+  'vulkan_loader_revision': 'e94cd2e354123fc5c92cb7d843dd30f95349539d',
 
   # Current revision of Khronos Vulkan-Tools.
   'vulkan_tools_revision': '9aec60c387fb0cd065d3ba921b56c3ef19ad958e',
@@ -34,7 +34,7 @@ vars = {
   'vulkan_utility_libraries_revision': 'd0ffc68fe796ffd5752b7a2cba7c4f1d80ed7283',
 
   # Current revision of Khronos Vulkan-ValidationLayers.
-  'vulkan_validation_revision': '12f7fa5ed702e4216cfe572cf36acccc1d8eb729',
+  'vulkan_validation_revision': '8e5a28304e92e2d12900c12ffedd4b9f41ccd0d6',
 }
 
 deps = {
diff --git a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml
index 95be4e1127..c58a1d8fb8 100644
--- a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml
+++ b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_deployment.yml
@@ -41,7 +41,7 @@ jobs:
                 compiler: [{cc: clang, cxx: clang++}, {cc: gcc, cxx: g++}]
                 cmake_build_type: [Debug, Release]
         steps:
-            - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+            - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
             - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
             - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
               with:
@@ -105,7 +105,7 @@ jobs:
                 compiler: [{cc: clang, cxx: clang++}]
                 cmake_build_type: [Debug, Release]
         steps:
-            - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+            - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
             - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
             - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
               with:
@@ -162,7 +162,7 @@ jobs:
                 os: [{genus: windows-2019, family: windows}]
                 cmake_build_type: [Debug, Release]
         steps:
-            - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+            - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
             - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
             - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
               with:
diff --git a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml
index 9253ceca6c..33d0dd9016 100644
--- a/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml
+++ b/third_party/vulkan-deps/glslang/src/.github/workflows/continuous_integration.yml
@@ -17,7 +17,7 @@ jobs:
         compiler: [{cc: clang, cxx: clang++}, {cc: gcc, cxx: g++}]
         cmake_build_type: [Debug, Release]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
@@ -53,7 +53,7 @@ jobs:
         cmake_build_type: [Debug]
         flags: ['-fsanitize=address', '-fsanitize=thread']
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
@@ -91,7 +91,7 @@ jobs:
     name: Linux Backcompat
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.7'
@@ -126,7 +126,7 @@ jobs:
         compiler: [{cc: clang, cxx: clang++}, {cc: gcc, cxx: g++}]
         cmake_build_type: [Debug, Release]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
       - run: ./update_glslang_sources.py
       - run: cmake -S . -B build -D CMAKE_BUILD_TYPE=${{matrix.cmake_build_type}} -G Ninja -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON
@@ -150,7 +150,7 @@ jobs:
           os: [{genus: windows-2019, family: windows}]
           cmake_build_type: [Debug, Release]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
@@ -168,7 +168,7 @@ jobs:
   iOS:
     runs-on: macos-13
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@faf867a11c028c0b483fb2ae72b6fc8f7d842714 # v1.2.12
@@ -197,7 +197,7 @@ jobs:
         # Test both to ensure we are compatible with either approach.
         LEGACY: [ON, OFF]
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@faf867a11c028c0b483fb2ae72b6fc8f7d842714 # v1.2.12
@@ -220,7 +220,7 @@ jobs:
   emscripten:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.7'
diff --git a/third_party/vulkan-deps/glslang/src/.github/workflows/scorecard.yml b/third_party/vulkan-deps/glslang/src/.github/workflows/scorecard.yml
index ccbf1223b7..adcfa76773 100644
--- a/third_party/vulkan-deps/glslang/src/.github/workflows/scorecard.yml
+++ b/third_party/vulkan-deps/glslang/src/.github/workflows/scorecard.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           persist-credentials: false
 
@@ -40,7 +40,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
         with:
           name: SARIF file
           path: results.sarif
@@ -48,6 +48,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
         with:
           sarif_file: results.sarif
diff --git a/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp b/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
index 6d5309ff18..ef39aec32e 100755
--- a/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
+++ b/third_party/vulkan-deps/glslang/src/SPIRV/GlslangToSpv.cpp
@@ -8075,6 +8075,7 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
     }
 
     std::vector<spv::Id> spvAtomicOperands;  // hold the spv operands
+    spvAtomicOperands.reserve(6);
     spvAtomicOperands.push_back(pointerId);
     spvAtomicOperands.push_back(scopeId);
     spvAtomicOperands.push_back(semanticsId);
@@ -10203,6 +10204,7 @@ spv::Id TGlslangToSpvTraverser::createShortCircuit(glslang::TOperator op, glslan
 
     // Operands to accumulate OpPhi operands
     std::vector<spv::Id> phiOperands;
+    phiOperands.reserve(4);
     // accumulate left operand's phi information
     phiOperands.push_back(leftId);
     phiOperands.push_back(builder.getBuildPoint()->getId());
diff --git a/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.shapeConv.frag.out b/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.shapeConv.frag.out
index 05bfa6ab0b..0fd379b54e 100644
--- a/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.shapeConv.frag.out
+++ b/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.shapeConv.frag.out
@@ -102,8 +102,10 @@ gl_FragCoord origin is upper left
 0:27        'v' ( temp 4-component vector of float)
 0:27        Construct vec4 ( temp 4-component vector of float)
 0:27          'f1' ( temp 1-component vector of float)
-0:28      Construct float ( temp float)
+0:28      direct index ( temp float)
 0:28        'f1' ( temp 1-component vector of float)
+0:28        Constant:
+0:28          0 (const int)
 0:29      Construct vec3 ( temp 3-component vector of float)
 0:29        Construct float ( temp float)
 0:29          'f1' ( temp 1-component vector of float)
@@ -264,8 +266,10 @@ gl_FragCoord origin is upper left
 0:27        'v' ( temp 4-component vector of float)
 0:27        Construct vec4 ( temp 4-component vector of float)
 0:27          'f1' ( temp 1-component vector of float)
-0:28      Construct float ( temp float)
+0:28      direct index ( temp float)
 0:28        'f1' ( temp 1-component vector of float)
+0:28        Constant:
+0:28          0 (const int)
 0:29      Construct vec3 ( temp 3-component vector of float)
 0:29        Construct float ( temp float)
 0:29          'f1' ( temp 1-component vector of float)
@@ -320,7 +324,7 @@ gl_FragCoord origin is upper left
 
 // Module Version 10000
 // Generated by (magic number): 8000b
-// Id's are bound by 127
+// Id's are bound by 126
 
                               Capability Shader
                1:             ExtInstImport  "GLSL.std.450"
@@ -339,11 +343,11 @@ gl_FragCoord origin is upper left
                               Name 34  "MyVal"
                               Name 37  "foo"
                               Name 70  "f1"
-                              Name 83  "ui"
-                              Name 88  "ui3"
-                              Name 103  "mixed"
-                              Name 115  "sf"
-                              Name 118  "sf1"
+                              Name 82  "ui"
+                              Name 87  "ui3"
+                              Name 102  "mixed"
+                              Name 114  "sf"
+                              Name 117  "sf1"
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -375,11 +379,11 @@ gl_FragCoord origin is upper left
               56:             TypeInt 32 0
               57:     56(int) Constant 0
               62:             TypeVector 41(bool) 4
-              82:             TypePointer Function 56(int)
-              85:             TypeVector 56(int) 3
-              87:             TypePointer Function 85(ivec3)
-             122:    6(float) Constant 1077936128
-             123:    7(fvec4) ConstantComposite 122 122 122 122
+              81:             TypePointer Function 56(int)
+              84:             TypeVector 56(int) 3
+              86:             TypePointer Function 84(ivec3)
+             121:    6(float) Constant 1077936128
+             122:    7(fvec4) ConstantComposite 121 121 121 121
          4(main):           2 Function None 3
                5:             Label
                               Return
@@ -395,11 +399,11 @@ gl_FragCoord origin is upper left
        34(MyVal):     23(ptr) Variable Function
          37(foo):     23(ptr) Variable Function
           70(f1):      9(ptr) Variable Function
-          83(ui):     82(ptr) Variable Function
-         88(ui3):     87(ptr) Variable Function
-      103(mixed):     23(ptr) Variable Function
-         115(sf):      9(ptr) Variable Function
-        118(sf1):      9(ptr) Variable Function
+          82(ui):     81(ptr) Variable Function
+         87(ui3):     86(ptr) Variable Function
+      102(mixed):     23(ptr) Variable Function
+         114(sf):      9(ptr) Variable Function
+        117(sf1):      9(ptr) Variable Function
                               Store 15(v) 17
                               Store 15(v) 19
               20:    6(float) Load 12(f)
@@ -443,47 +447,46 @@ gl_FragCoord origin is upper left
               77:    7(fvec4) CompositeConstruct 76 76 76 76
               78:   62(bvec4) FOrdLessThan 75 77
               79:    6(float) Load 70(f1)
-              80:    6(float) Load 70(f1)
-              81:   22(fvec3) CompositeConstruct 80 80 80
-              84:     56(int) Load 83(ui)
-              86:   85(ivec3) CompositeConstruct 84 84 84
-              89:   85(ivec3) Load 88(ui3)
-              90:   85(ivec3) ShiftRightLogical 86 89
-              91:   85(ivec3) Load 88(ui3)
-              92:     56(int) Load 83(ui)
-              93:   85(ivec3) CompositeConstruct 92 92 92
-              94:   85(ivec3) ShiftRightLogical 91 93
-              95:    6(float) Load 70(f1)
-              96:    7(fvec4) Load 15(v)
-              97:    7(fvec4) CompositeConstruct 95 95 95 95
-              98:    7(fvec4) FMul 96 97
-                              Store 15(v) 98
-              99:    7(fvec4) Load 15(v)
-             100:    6(float) CompositeExtract 99 0
-             101:    6(float) Load 70(f1)
-             102:    6(float) FMul 101 100
-                              Store 70(f1) 102
-             104:   22(fvec3) Load 24(u)
-             105:    7(fvec4) Load 15(v)
-             106:    6(float) CompositeExtract 105 0
-             107:    6(float) CompositeExtract 105 1
-             108:    6(float) CompositeExtract 105 2
-             109:   22(fvec3) CompositeConstruct 106 107 108
-             110:   22(fvec3) FMul 104 109
-                              Store 103(mixed) 110
-             111:   22(fvec3) Load 24(u)
-             112:    6(float) CompositeExtract 111 0
-                              Store 12(f) 112
-             113:   22(fvec3) Load 24(u)
-             114:    6(float) CompositeExtract 113 0
-                              Store 70(f1) 114
-             116:    7(fvec4) Load 15(v)
-             117:    6(float) CompositeExtract 116 0
-                              Store 115(sf) 117
-             119:    7(fvec4) Load 15(v)
-             120:    6(float) CompositeExtract 119 0
-                              Store 118(sf1) 120
-             121:    7(fvec4) Load 11(input)
-             124:    7(fvec4) FMul 121 123
-                              ReturnValue 124
+              80:   22(fvec3) CompositeConstruct 79 79 79
+              83:     56(int) Load 82(ui)
+              85:   84(ivec3) CompositeConstruct 83 83 83
+              88:   84(ivec3) Load 87(ui3)
+              89:   84(ivec3) ShiftRightLogical 85 88
+              90:   84(ivec3) Load 87(ui3)
+              91:     56(int) Load 82(ui)
+              92:   84(ivec3) CompositeConstruct 91 91 91
+              93:   84(ivec3) ShiftRightLogical 90 92
+              94:    6(float) Load 70(f1)
+              95:    7(fvec4) Load 15(v)
+              96:    7(fvec4) CompositeConstruct 94 94 94 94
+              97:    7(fvec4) FMul 95 96
+                              Store 15(v) 97
+              98:    7(fvec4) Load 15(v)
+              99:    6(float) CompositeExtract 98 0
+             100:    6(float) Load 70(f1)
+             101:    6(float) FMul 100 99
+                              Store 70(f1) 101
+             103:   22(fvec3) Load 24(u)
+             104:    7(fvec4) Load 15(v)
+             105:    6(float) CompositeExtract 104 0
+             106:    6(float) CompositeExtract 104 1
+             107:    6(float) CompositeExtract 104 2
+             108:   22(fvec3) CompositeConstruct 105 106 107
+             109:   22(fvec3) FMul 103 108
+                              Store 102(mixed) 109
+             110:   22(fvec3) Load 24(u)
+             111:    6(float) CompositeExtract 110 0
+                              Store 12(f) 111
+             112:   22(fvec3) Load 24(u)
+             113:    6(float) CompositeExtract 112 0
+                              Store 70(f1) 113
+             115:    7(fvec4) Load 15(v)
+             116:    6(float) CompositeExtract 115 0
+                              Store 114(sf) 116
+             118:    7(fvec4) Load 15(v)
+             119:    6(float) CompositeExtract 118 0
+                              Store 117(sf1) 119
+             120:    7(fvec4) Load 11(input)
+             123:    7(fvec4) FMul 120 122
+                              ReturnValue 123
                               FunctionEnd
diff --git a/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.swizzle.vec1.comp.out b/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.swizzle.vec1.comp.out
new file mode 100644
index 0000000000..e1583b889f
--- /dev/null
+++ b/third_party/vulkan-deps/glslang/src/Test/baseResults/hlsl.swizzle.vec1.comp.out
@@ -0,0 +1,72 @@
+hlsl.swizzle.vec1.comp
+Shader version: 500
+local_size = (1, 1, 1)
+0:? Sequence
+0:2  Function Definition: @main( ( temp void)
+0:2    Function Parameters: 
+0:?     Sequence
+0:4      move second child to first child ( temp float)
+0:4        direct index ( temp float)
+0:4          'f1' ( temp 1-component vector of float)
+0:4          Constant:
+0:4            0 (const int)
+0:4        Constant:
+0:4          0.500000
+0:2  Function Definition: main( ( temp void)
+0:2    Function Parameters: 
+0:?     Sequence
+0:2      Function Call: @main( ( temp void)
+0:?   Linker Objects
+
+
+Linked compute stage:
+
+
+Shader version: 500
+local_size = (1, 1, 1)
+0:? Sequence
+0:2  Function Definition: @main( ( temp void)
+0:2    Function Parameters: 
+0:?     Sequence
+0:4      move second child to first child ( temp float)
+0:4        direct index ( temp float)
+0:4          'f1' ( temp 1-component vector of float)
+0:4          Constant:
+0:4            0 (const int)
+0:4        Constant:
+0:4          0.500000
+0:2  Function Definition: main( ( temp void)
+0:2    Function Parameters: 
+0:?     Sequence
+0:2      Function Call: @main( ( temp void)
+0:?   Linker Objects
+
+// Module Version 10000
+// Generated by (magic number): 8000b
+// Id's are bound by 13
+
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint GLCompute 4  "main"
+                              ExecutionMode 4 LocalSize 1 1 1
+                              Source HLSL 500
+                              Name 4  "main"
+                              Name 6  "@main("
+                              Name 10  "f1"
+               2:             TypeVoid
+               3:             TypeFunction 2
+               8:             TypeFloat 32
+               9:             TypePointer Function 8(float)
+              11:    8(float) Constant 1056964608
+         4(main):           2 Function None 3
+               5:             Label
+              12:           2 FunctionCall 6(@main()
+                              Return
+                              FunctionEnd
+       6(@main():           2 Function None 3
+               7:             Label
+          10(f1):      9(ptr) Variable Function
+                              Store 10(f1) 11
+                              Return
+                              FunctionEnd
diff --git a/third_party/vulkan-deps/glslang/src/Test/hlsl.swizzle.vec1.comp b/third_party/vulkan-deps/glslang/src/Test/hlsl.swizzle.vec1.comp
new file mode 100644
index 0000000000..1ee454cc73
--- /dev/null
+++ b/third_party/vulkan-deps/glslang/src/Test/hlsl.swizzle.vec1.comp
@@ -0,0 +1,8 @@
+void main()
+{
+    float1 f1;
+    f1.x = 0.5;
+
+    // This is not implemented
+    // f1.xx = float2(0.6, 0.7);
+}
diff --git a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
index a1ae55c82e..0fd724d0d9 100644
--- a/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
+++ b/third_party/vulkan-deps/glslang/src/glslang/HLSL/hlslParseHelper.cpp
@@ -962,14 +962,11 @@ TIntermTyped* HlslParseContext::handleDotDereference(const TSourceLoc& loc, TInt
                 return addConstructor(loc, base, type);
             }
         }
-        if (base->getVectorSize() == 1) {
+        // Use EOpIndexDirect (below) with vec1.x so that it remains l-value (Test/hlsl.swizzle.vec1.comp)
+        if (base->getVectorSize() == 1 && selectors.size() > 1) {
             TType scalarType(base->getBasicType(), EvqTemporary, 1);
-            if (selectors.size() == 1)
-                return addConstructor(loc, base, scalarType);
-            else {
-                TType vectorType(base->getBasicType(), EvqTemporary, selectors.size());
-                return addConstructor(loc, addConstructor(loc, base, scalarType), vectorType);
-            }
+            TType vectorType(base->getBasicType(), EvqTemporary, selectors.size());
+            return addConstructor(loc, addConstructor(loc, base, scalarType), vectorType);
         }
 
         if (base->getType().getQualifier().isFrontEndConstant())
diff --git a/third_party/vulkan-deps/glslang/src/gtests/Hlsl.FromFile.cpp b/third_party/vulkan-deps/glslang/src/gtests/Hlsl.FromFile.cpp
index 75af7c8c60..c94a3381ac 100644
--- a/third_party/vulkan-deps/glslang/src/gtests/Hlsl.FromFile.cpp
+++ b/third_party/vulkan-deps/glslang/src/gtests/Hlsl.FromFile.cpp
@@ -420,6 +420,7 @@ INSTANTIATE_TEST_SUITE_P(
         {"hlsl.structIoFourWay.frag", "main"},
         {"hlsl.structStructName.frag", "main"},
         {"hlsl.subpass.frag", "main"},
+        {"hlsl.swizzle.vec1.comp", "main"},
         {"hlsl.synthesizeInput.frag", "main"},
         {"hlsl.texturebuffer.frag", "main"},
         {"hlsl.texture.struct.frag", "main"},
diff --git a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/autoroll.yml b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/autoroll.yml
index e9b3176cf1..ed33622be1 100644
--- a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/autoroll.yml
+++ b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/autoroll.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
       # Checkout the depot tools they are needed by roll_deps.sh
       - name: Checkout depot tools
diff --git a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/bazel.yml b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/bazel.yml
index 9dabf88a91..43c99d667b 100644
--- a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/bazel.yml
+++ b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/bazel.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           fetch-depth: '0'
       - name: Download dependencies
diff --git a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/ios.yml b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/ios.yml
index 10ee627a0d..feb64a7755 100644
--- a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/ios.yml
+++ b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/ios.yml
@@ -11,8 +11,8 @@ jobs:
         matrix:
           os: [ macos-12, macos-13 ]
     steps:
-        - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-        - uses: lukka/get-cmake@b111a57714ab6e67a65d3f857b72b148554c4262 # v3.29.1
+        - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        - uses: lukka/get-cmake@4931ab1fc1604964c055eb330edb3f6b26ba0cfa # v3.29.2
         - name: Download dependencies
           run: python3 utils/git-sync-deps
         # NOTE: The MacOS SDK ships universal binaries. CI should reflect this.
diff --git a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/release.yml b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/release.yml
index 78750d906e..583c8f1fd6 100644
--- a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/release.yml
+++ b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
   prepare-release-job:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - name: Prepare CHANGELOG for version
         run: |
           python utils/generate_changelog.py CHANGES "${{ github.ref_name }}" VERSION_CHANGELOG
diff --git a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/scorecard.yml b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/scorecard.yml
index 7d624c6211..adcfa76773 100644
--- a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/scorecard.yml
+++ b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/scorecard.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           persist-credentials: false
 
@@ -40,7 +40,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
         with:
           name: SARIF file
           path: results.sarif
@@ -48,6 +48,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
         with:
           sarif_file: results.sarif
diff --git a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/wasm.yml b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/wasm.yml
index 06ad522b34..6807b3d1eb 100644
--- a/third_party/vulkan-deps/spirv-tools/src/.github/workflows/wasm.yml
+++ b/third_party/vulkan-deps/spirv-tools/src/.github/workflows/wasm.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           fetch-depth: '0'
       - name: Build web
diff --git a/third_party/vulkan-deps/spirv-tools/src/CHANGES b/third_party/vulkan-deps/spirv-tools/src/CHANGES
index 5a771be173..102703a87e 100644
--- a/third_party/vulkan-deps/spirv-tools/src/CHANGES
+++ b/third_party/vulkan-deps/spirv-tools/src/CHANGES
@@ -1,5 +1,20 @@
 Revision history for SPIRV-Tools
 
+v2024.2 2024-04-22
+  - General
+    - Add SPIRV_TOOLS_EXPORT to public C++ API (#5591)
+    - Use bazel 7 and bzlmod (#5601)
+  - Optimizer
+    - opt: add GroupNonUniformPartitionedNV capability to trim pass (#5648)
+    - Fix rebuilding types with circular references. (#5637)
+    - Add AliasedPointer decoration (#5635)
+    - add support for vulkan-shader-profiler external passes (#5512)
+  - Validator
+    - A fix to support of SPV_QCOM_image_processing2 (#5646)
+    - spirv-val: Add Vulkan check for Rect Dim in OpTypeImage (#5644)
+    - Validate duplicate decorations and execution modes (#5641)
+    - Validator: Support SPV_NV_raw_access_chains (#5568)
+
 v2024.1 2024-03-06
   - General
     - Add tooling support for SPV_KHR_maximal_reconvergence (#5542)
diff --git a/third_party/vulkan-deps/spirv-tools/src/DEPS b/third_party/vulkan-deps/spirv-tools/src/DEPS
index 9dcbb09aa9..8413d1beb9 100644
--- a/third_party/vulkan-deps/spirv-tools/src/DEPS
+++ b/third_party/vulkan-deps/spirv-tools/src/DEPS
@@ -7,7 +7,7 @@ vars = {
 
   'effcee_revision': '19b4aa87af25cb4ee779a071409732f34bfc305c',
 
-  'googletest_revision': 'eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7',
+  'googletest_revision': '5a37b517ad4ab6738556f0284c256cae1466c5b4',
 
   # Use protobufs before they gained the dependency on abseil
   'protobuf_revision': 'v21.12',
diff --git a/util/autogen/angle_features_autogen.cpp b/util/autogen/angle_features_autogen.cpp
index 6d38e97a37..e5c1e191f0 100644
--- a/util/autogen/angle_features_autogen.cpp
+++ b/util/autogen/angle_features_autogen.cpp
@@ -255,7 +255,6 @@ constexpr PackedEnumMap<Feature, const char *> kFeatureNames = {{
     {Feature::RegenerateStructNames, "regenerateStructNames"},
     {Feature::RemoveDynamicIndexingOfSwizzledVector, "removeDynamicIndexingOfSwizzledVector"},
     {Feature::RemoveInvariantAndCentroidForESSL3, "removeInvariantAndCentroidForESSL3"},
-    {Feature::RequireCachedBitForStagingBuffer, "requireCachedBitForStagingBuffer"},
     {Feature::RequireGpuFamily2, "requireGpuFamily2"},
     {Feature::RequireMsl21, "requireMsl21"},
     {Feature::RescopeGlobalVariables, "rescopeGlobalVariables"},
diff --git a/util/autogen/angle_features_autogen.h b/util/autogen/angle_features_autogen.h
index 4e120e4b63..0d969f7213 100644
--- a/util/autogen/angle_features_autogen.h
+++ b/util/autogen/angle_features_autogen.h
@@ -255,7 +255,6 @@ enum class Feature
     RegenerateStructNames,
     RemoveDynamicIndexingOfSwizzledVector,
     RemoveInvariantAndCentroidForESSL3,
-    RequireCachedBitForStagingBuffer,
     RequireGpuFamily2,
     RequireMsl21,
     RescopeGlobalVariables,