diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-04-25 21:54:27 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-04-25 21:54:27 +0200 |
| commit | 17e2be173c9bb24375a4fc7bc746db21e0706d01 (patch) | |
| tree | 47c8d6392106d3b337b31c01c71f4aa3e544a0c3 /externals | |
| parent | bd6dd7ecec299f98fbde7598f48156370b80fd8f (diff) | |
[spirv] nuke spirv-opt (#3877)
lots of AGILEism in spirv-opt
theres BETTER alternatives like https://github.com/renderbag/re-spirv (im not gonna bother for now, it probably has shitty build system)
it sucks
the IR already resolves most of the shader code to just constant load/stores
Spirv-opt passes do not seem to make such a big difference
only introduce extra latency
like for example cbuf pass in IR already removes a lot of code, that spirv_opt would otherwise miss due to the fact it doesn't have cbuf information
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Co-authored-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3877
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: crueter <crueter@eden-emu.dev>
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | externals/cpmfile.json | 14 | ||||
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 4 |
3 files changed, 2 insertions, 24 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index ba0545b7a7..e230f709fa 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -192,14 +192,6 @@ else() endif() endif() -# SPIRV Tools -AddJsonPackage(spirv-tools) - -if (SPIRV-Tools_ADDED) - add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools-static) - target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link) -endif() - # Catch2 if (YUZU_TESTS OR DYNARMIC_TESTS) AddJsonPackage(catch2) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index b8472774ae..0f8d34230c 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -102,20 +102,6 @@ "git_version": "1.3.18", "find_args": "MODULE" }, - "spirv-tools": { - "package": "SPIRV-Tools", - "repo": "KhronosGroup/SPIRV-Tools", - "sha": "0a7e28689a", - "hash": "eadfcceb82f4b414528d99962335e4f806101168474028f3cf7691ac40c37f323decf2a42c525e2d5bfa6f14ff132d6c5cf9b87c151490efad01f5e13ade1520", - "git_version": "2025.4", - "options": [ - "SPIRV_SKIP_EXECUTABLES ON" - ], - "patches": [ - "0001-netbsd-fix.patch", - "0002-allow-static-only.patch" - ] - }, "spirv-headers": { "package": "SPIRV-Headers", "repo": "KhronosGroup/SPIRV-Headers", diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index 3140f8e545..fcc48c71c4 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2021 yuzu Emulator Project @@ -254,7 +254,7 @@ else() OUTPUT ${FFmpeg_BUILD_LIBRARIES} COMMAND - make ${FFmpeg_MAKE_ARGS} + gmake ${FFmpeg_MAKE_ARGS} WORKING_DIRECTORY ${FFmpeg_BUILD_DIR} ) |