From 5c4a81b6dab7d086c763d839ab9aedf14fce54b6 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 15 Feb 2024 16:59:55 -0500
Subject: [PATCH] win: distrib: Add DirectX compiler binaries for WebGPU (fixes
 #3646)

---
 cmake/cef_variables.cmake.in           | 7 +++++++
 tools/distrib/win/README.redistrib.txt | 6 ++++++
 tools/make_distrib.py                  | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in
index b7c5d4852..9f10f1d9f 100644
--- a/cmake/cef_variables.cmake.in
+++ b/cmake/cef_variables.cmake.in
@@ -554,6 +554,13 @@ if(OS_WINDOWS)
     vulkan-1.dll
     )
 
+  if(PROJECT_ARCH STREQUAL "x86_64")
+    list(APPEND CEF_BINARY_FILES
+      dxil.dll
+      dxcompiler.dll
+      )
+  endif()
+
   # List of CEF resource files.
   set(CEF_RESOURCE_FILES
     chrome_100_percent.pak
diff --git a/tools/distrib/win/README.redistrib.txt b/tools/distrib/win/README.redistrib.txt
index 29675cb02..5bc36d42a 100644
--- a/tools/distrib/win/README.redistrib.txt
+++ b/tools/distrib/win/README.redistrib.txt
@@ -56,6 +56,12 @@ run but any related functionality may become broken or disabled.
   is recommended instead of relying on the possibly old and untested system
   installed version.
 
+* DirectX compiler support (x64 only).
+  * dxil.dll
+  * dxcompiler.dll
+  Support for DirectX rendering of WebGPU. Without these files the
+  aforementioned capabilities may fail.
+
 * ANGLE support.
   * libEGL.dll
   * libGLESv2.dll
diff --git a/tools/make_distrib.py b/tools/make_distrib.py
index 9c2fdf0d9..239752527 100644
--- a/tools/make_distrib.py
+++ b/tools/make_distrib.py
@@ -890,6 +890,8 @@ if platform == 'windows':
   binaries = [
       {'path': 'chrome_elf.dll'},
       {'path': 'd3dcompiler_47.dll'},
+      {'path': 'dxcompiler.dll', 'conditional': True},
+      {'path': 'dxil.dll', 'conditional': True},
       {'path': libcef_dll},
       {'path': 'libEGL.dll'},
       {'path': 'libGLESv2.dll'},