chore: update patches

patches/DirectXShaderCompiler/cherry-pick-bc18aec94c82.patch

@@ -1,7 +1,7 @@
-From bc18aec94c828f7dc3ba0eb8ad964dfb6453b903 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Antonio Maiorano <amaiorano@google.com>
 Date: Thu, 18 Apr 2024 13:07:04 -0400
-Subject: [PATCH] Replace dynamic_cast with virtual call (#6515)
+Subject: Replace dynamic_cast with virtual call (#6515)
 
 Make TextDiagnosticPrinter::setPrefix a virtual function in base class
 DiagnosticConsumer. This allows us to avoid using dynamic_cast in
@@ -14,13 +14,12 @@ Change-Id: Ida73077f24fdb4b705b5d868b04ac6cfecb30327
 Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5464347
 Reviewed-by: dan sinclair <dsinclair@chromium.org>
 Reviewed-by: David Neto <dneto@google.com>
----
 
 diff --git a/tools/clang/include/clang/Basic/Diagnostic.h b/tools/clang/include/clang/Basic/Diagnostic.h
-index dc9f781..0b98dff 100644
+index dc9f781c093c0bc8f6da773d514ac6d1503f842d..0b98dffb94185e242320409d43b74dae2c2a908d 100644
 --- a/tools/clang/include/clang/Basic/Diagnostic.h
 +++ b/tools/clang/include/clang/Basic/Diagnostic.h
-@@ -1395,6 +1395,8 @@
+@@ -1395,6 +1395,8 @@ public:
    /// warnings and errors.
    virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
                                  const Diagnostic &Info);
@@ -30,10 +29,10 @@ index dc9f781..0b98dff 100644
 
  /// \brief A diagnostic client that ignores all diagnostics.
 diff --git a/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h b/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
-index 04a5705..936031e 100644
+index 04a570559fe06a0670ef8a7e6e94c40aa37e55a9..936031e09673a09c6e1164c515efce02ac51b910 100644
 --- a/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
 +++ b/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
-@@ -45,7 +45,8 @@
+@@ -45,7 +45,8 @@ public:
    /// setPrefix - Set the diagnostic printer prefix string, which will be
    /// printed at the start of any diagnostics. If empty, no prefix string is
    /// used.
@@ -44,10 +43,10 @@ index 04a5705..936031e 100644
    void BeginSourceFile(const LangOptions &LO, const Preprocessor *PP) override;
    void EndSourceFile() override;
 diff --git a/tools/clang/lib/CodeGen/CodeGenAction.cpp b/tools/clang/lib/CodeGen/CodeGenAction.cpp
-index 4fa721e..68ebaad 100644
+index 4fa721e812296356e31fc1bf6ea35ce295c2592c..68ebaadf5a8960c8def189248412136fe9543422 100644
 --- a/tools/clang/lib/CodeGen/CodeGenAction.cpp
 +++ b/tools/clang/lib/CodeGen/CodeGenAction.cpp
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ BackendConsumer::DxilDiagHandler(const llvm::DiagnosticInfoDxil &D) {
 
    // If no location information is available, add function name
    if (Loc.isInvalid()) {

patches/angle/cherry-pick-ba3b4e239620.patch

@@ -1,7 +1,7 @@
-From ba3b4e239620c95792e7d23c2975be4ab26d153e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Mon, 08 Apr 2024 10:14:45 -0400
-Subject: [PATCH] M123: SPIR-V: Fix const constructors with single scalar
+Date: Mon, 8 Apr 2024 10:14:45 -0400
+Subject: M123: SPIR-V: Fix const constructors with single scalar
 
 These constructors may be generated because of
 RemoveArrayLengthTraverser.
@@ -14,13 +14,12 @@ Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5473406
 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
 Reviewed-by: Geoff Lang <geofflang@chromium.org>
 Reviewed-by: Daniel Gagnon <dgagnon@google.com>
----
 
 diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
-index 88f21c4..7702c9a 100644
+index eddc5e724e8e949aff0624c6caf9aadec7c14647..57a71c5d13fbf5e458c26b084e1f9834edb37f58 100644
 --- a/src/compiler/translator/Compiler.cpp
 +++ b/src/compiler/translator/Compiler.cpp
-@@ -1061,6 +1061,11 @@
+@@ -1056,6 +1056,11 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
      {
          return false;
      }
@@ -33,10 +32,10 @@ index 88f21c4..7702c9a 100644
      if (!RemoveUnreferencedVariables(this, root, &mSymbolTable))
      {
 diff --git a/src/compiler/translator/spirv/OutputSPIRV.cpp b/src/compiler/translator/spirv/OutputSPIRV.cpp
-index 6eb72d6..1d85aff 100644
+index caa8f956716abf53aaeb58a5f654f5a4f04c4d6a..67b1fdd4784660483a408f1ee27ce48b05ffcb0a 100644
 --- a/src/compiler/translator/spirv/OutputSPIRV.cpp
 +++ b/src/compiler/translator/spirv/OutputSPIRV.cpp
-@@ -1335,6 +1335,8 @@
+@@ -1335,6 +1335,8 @@ spirv::IdRef OutputSPIRVTraverser::createComplexConstant(const TType &type,
 
      if (type.isMatrix() && !type.isArray())
      {
@@ -46,10 +45,10 @@ index 6eb72d6..1d85aff 100644
          spirv::IdRefList columnIds;
 
 diff --git a/src/tests/gl_tests/GLSLTest.cpp b/src/tests/gl_tests/GLSLTest.cpp
-index 2604bd7..2ea6984 100644
+index cfe6414d52647db92669be954cadd15344603559..a4035db329548491c91e2f7383f837001540c065 100644
 --- a/src/tests/gl_tests/GLSLTest.cpp
 +++ b/src/tests/gl_tests/GLSLTest.cpp
-@@ -8486,6 +8486,198 @@
+@@ -8486,6 +8486,198 @@ void main()
      EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
  }