Open Bug 2016234 Opened 3 days ago Updated 14 hours ago

Update DXC to dc9cb896 (FirefoxGraphics/moz-1.9.2602, 2026-2-14)

Categories

(Core :: Graphics: WebGPU, task, P1)

task

Tracking

()

ASSIGNED

People

(Reporter: jimb, Assigned: jimb)

References

Details

Attachments

(1 file)

We should update the version of DXC that we ship with Firefox to the latest Microsoft release, 1.9.2602. That version includes our bug fixes that are in the DXC we ship now, which were merged into the upstream sources at git@github.com:microsoft/DirectXShaderCompiler.git as the following commits:

377c4ca6d82adb83bf2eaf978a7040443848d6fd
d70b568f63312624165c9a39f7e536fbd22aab25

Update the version of DXC that we ship with Firefox to the latest
Microsoft release, 1.9.2602. That version includes our bug fixes that
are in the DXC we ship now, which were merged into the upstream
sources at git@github.com:microsoft/DirectXShaderCompiler.git as the
following commits:

377c4ca6d82adb83bf2eaf978a7040443848d6fd
d70b568f63312624165c9a39f7e536fbd22aab25

Assignee: nobody → jimb
Status: NEW → ASSIGNED
See Also: → 2016236

try push

Prior push failed because the commit was only present in Microsoft's repo, not FirefoxGraphics' clone of that.

From this error I gather the build command has changed:

+ cmake .. -C ../cmake/caches/PredefinedParams.cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/WinMsvc.cmake -DHOST_ARCH=x86_64 -DCMAKE_BUILD_TYPE=Release -DLLVM_DISABLE_ASSEMBLY_FILES=ON -DLLVM_NATIVE_TOOLCHAIN=/builds/worker/fetches/clang -DLLVM_WINSYSROOT=/builds/worker/fetches/vs '-DDIASDK_INCLUDE_DIR=/builds/worker/fetches/vs/DIA SDK/include' '-DWIN10_SDK_PATH=/builds/worker/fetches/vs/Windows Kits/10' -DWIN10_SDK_VERSION=10.0.26100.0 -DCMAKE_RC_COMPILER=/builds/worker/fetches/clang/bin/llvm-rc -DHLSL_INCLUDE_TESTS=OFF -DCLANG_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TESTS=OFF -DHLSL_BUILD_DXILCONV=OFF -DSPIRV_WERROR=OFF -DENABLE_SPIRV_CODEGEN=OFF -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ASSERTIONS_NO_STRINGS=ON -DLLVM_ASSERTIONS_TRAP=ON -DDXC_CODEGEN_EXCEPTIONS_TRAP=ON -DDXC_DISABLE_ALLOCATOR_OVERRIDES=ON -G Ninja
loading initial cache file ../cmake/caches/PredefinedParams.cmake
CMake Error at /usr/share/cmake-3.25/Modules/CMakeDetermineSystem.cmake:130 (message):
  Could not find toolchain file: ../cmake/platforms/WinMsvc.cmake

Made some commentary in the patch about making the build succeed.

Attachment #9544372 - Attachment description: Bug 2016234: Update DXC to 900ee069 (microsoft/release-1.9.2602, 2026-2-5) r=#webgpu-reviewers! → Bug 2016234: Update DXC to dc9cb896 (FirefoxGraphics/moz-1.9.2602, 2026-2-14) r=#webgpu-reviewers!

As Erich pointed out in Phab, I had forgotten that our branch contains a bunch of changes that are not appropriate for submission upstream. I've properly merged them into our branch now.

Summary: Update DXC to 900ee069 (microsoft/release-1.9.2602, 2026-2-5) → Update DXC to dc9cb896 (FirefoxGraphics/moz-1.9.2602, 2026-2-14)

whaddaya know, it works better if you actually merge all the changes

You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: