mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: cherry-pick 3 changes from 0-M127 (#43159)

Browse source 
* chore: [30-x-y] cherry-pick 3 changes from 0-M127

* 44b7fbf35b10 from chromium
* c9815acd5a88 from dawn
* 9463ce9cd8d9 from DirectXShaderCompiler

* chore: e patches all

to make GH actions happy

---------

Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Pedro Pontes 2024-08-02 13:54:14 +01:00 • committed by GitHub
parent 1ec867c8a1
commit 3b45a30d2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 580 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
patches/dawn/deps_update_dxc_to_patched_branch.patch Normal file
View file

@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: David Neto <dneto@google.com>
Date: Wed, 17 Jul 2024 14:09:26 +0000
Subject: DEPS: Update DXC to patched branch
Also, add DXC_CODEGEN_EXCEPTIONS_TRAP=1 to DXC gn config.
Bug: chromium:346618785, chromium:350696474
Change-Id: I4c1ac753d824c4790e78d8f36231c8f2fe0e2722
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/198756
Reviewed-by: Natalie Chouinard <chouinard@google.com>
diff --git a/third_party/gn/dxc/BUILD.gn b/third_party/gn/dxc/BUILD.gn
index aadb64eeb4fba2f2da442a8a7f4b285a469c5cdd..0060484cefcf1835138b111258c33e09fab1279c 100644
--- a/third_party/gn/dxc/BUILD.gn
+++ b/third_party/gn/dxc/BUILD.gn
@@ -453,7 +453,10 @@ cmake_configure_file("clang-config-h") {
cmake_configure_file("dxc-config-h") {
input = "$dawn_dxc_dir/include/dxc/config.h.cmake"
output = "$target_gen_dir/include/dxc/config.h"
- values = [ "DXC_DISABLE_ALLOCATOR_OVERRIDES=1" ]
+ values = [
+ "DXC_DISABLE_ALLOCATOR_OVERRIDES=1",
+ "DXC_CODEGEN_EXCEPTIONS_TRAP=1",
+ ]
}
#######################################################################