[vulkan] Correction on unconditional/ harcoded makeview 2D array vs compute shader 3D views

[vulkan] Added buffer memory barrier to keep track of previous buffer's active transfer
[vulkan] Added transfer bits to compute memory barriers
2026-08-15 05:15:14 +00:00 · 2026-07-03 17:54:55 -04:00 · 2026-07-03 16:47:49 -04:00 · 2026-07-03 15:37:19 -04:00 · 2026-07-03 03:25:45 -04:00
66 changed files with 3575 additions and 2614 deletions
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 16c6092..9e75548 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -8,7 +8,14 @@ project(adrenotools LANGUAGES CXX C)
+ 
+ set(GEN_INSTALL_TARGET OFF CACHE BOOL "")
+ 
+-add_subdirectory(lib/linkernsbypass)
+include(CPM)
+set(CPM_USE_LOCAL_PACKAGES OFF)
+
+CPMAddPackage(
+    NAME linkernsbypass
+    URL "https://github.com/bylaws/liblinkernsbypass/archive/aa3975893d.zip"
+    URL_HASH SHA512=43d3d146facb7ec99d066a9b8990369ab7b9eec0d5f9a67131b0a0744fde0af27d884ca1f2a272cd113718a23356530ed97703c8c0659c4c25948d50c106119e
+)
+ 
+ set(LIB_SOURCES src/bcenabler.cpp
+                 src/driver.cpp
@@ -1,26 +0,0 @@
-From 52bbc5af6523daa22ad62fe4b84bc8d623d11a53 Mon Sep 17 00:00:00 2001
-From: crueter <crueter@eden-emu.dev>
-Date: Fri, 26 Jun 2026 01:09:40 -0400
-Subject: [PATCH] use cpmfile def for linkernsbypass
-
---
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 16c6092..85b242c 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,8 @@ project(adrenotools LANGUAGES CXX C)
- 
- set(GEN_INSTALL_TARGET OFF CACHE BOOL "")
- 
-add_subdirectory(lib/linkernsbypass)
-+include(CPMUtil)
-+AddJsonPackage(linkernsbypass)
- 
- set(LIB_SOURCES src/bcenabler.cpp
-                 src/driver.cpp
-- 
-2.54.0
-
@@ -270,7 +270,7 @@ if (ANDROID AND YUZU_DOWNLOAD_ANDROID_VVL)
    set(abi ${CMAKE_ANDROID_ARCH_ABI})

    set(vvl_lib_path "${CMAKE_CURRENT_SOURCE_DIR}/src/android/app/src/main/jniLibs/${abi}/")
-    file(COPY "${vulkan-validation-layers_SOURCE_DIR}/${abi}/libVkLayer_khronos_validation.so"
+    file(COPY "${VVL_SOURCE_DIR}/${abi}/libVkLayer_khronos_validation.so"
        DESTINATION "${vvl_lib_path}")
 endif()

@@ -3,10 +3,11 @@
        "hash": "1229f345b014f7ca544dedb4edb3311e41ba736f9aa9a67f88b5f26f3c983288c6bb6cdedcfb0b8a02c63088a37e6a0d7ba97d9c2a4d721b213916327cffe28a",
        "min_version": "0.9.1",
        "repo": "lioncash/biscuit",
-        "version": "v0.19.0"
+        "tag": "v%VERSION%",
+        "version": "0.19.0"
    },
    "boost": {
-        "artifact": "%VERSION%-cmake.tar.xz",
+        "artifact": "%TAG%-cmake.tar.xz",
        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber filesystem",
        "hash": "6ae6e94664fe7f2fb01976b59b276ac5df8085c7503fa829d810fbfe495960cfec44fa2c36e2cb23480bc19c956ed199d4952b02639a00a6c07625d4e7130c2d",
        "min_version": "1.57",
@@ -15,13 +16,15 @@
            "0001-clang-cl.patch"
        ],
        "repo": "boostorg/boost",
-        "version": "boost-1.90.0"
+        "tag": "boost-%VERSION%",
+        "version": "1.90.0"
    },
    "boost_headers": {
        "bundled": true,
        "hash": "4ef845775e2277a8104ded6ddf749aa262ce52cf8438042869a048f9a0156dd772fbbcfa74efa1378fecef339b7286f6fe4b4feb5c45d49966b35d08e3e83507",
        "repo": "boostorg/headers",
-        "version": "boost-1.90.0"
+        "tag": "boost-%VERSION%",
+        "version": "1.90.0"
    },
    "catch2": {
        "hash": "7eea385d79d88a5690cde131fe7ccda97d5c54ea09d6f515000d7bf07c828809d61c1ac99912c1ee507cf933f61c1c47ecdcc45df7850ffa82714034b0fccf35",
@@ -31,7 +34,8 @@
            "0001-solaris-isnan-fix.patch"
        ],
        "repo": "catchorg/Catch2",
-        "version": "v3.13.0"
+        "tag": "v%VERSION%",
+        "version": "3.13.0"
    },
    "cpp-jwt": {
        "find_args": "CONFIG",
@@ -44,7 +48,8 @@
            "0001-fix-missing-decl.patch"
        ],
        "repo": "arun11299/cpp-jwt",
-        "version": "7f24eb4c32"
+        "sha": "7f24eb4c32",
+        "version": "1.5.1"
    },
    "cubeb": {
        "find_args": "CONFIG",
@@ -56,26 +61,31 @@
            "BUNDLE_SPEEX ON"
        ],
        "repo": "mozilla/cubeb",
-        "version": "fa02160712"
+        "sha": "fa02160712",
+        "version": "0.0.0"
    },
    "discord-rpc": {
        "find_args": "MODULE",
        "hash": "8213c43dcb0f7d479f5861091d111ed12fbdec1e62e6d729d65a4bc181d82f48a35d5fd3cd5c291f2393ac7c9681eabc6b76609755f55376284c8a8d67e148f3",
        "package": "DiscordRPC",
        "repo": "eden-emulator/discord-rpc",
-        "version": "0d8b2d6a37"
+        "sha": "0d8b2d6a37",
+        "version": "3.4.1"
    },
    "enet": {
        "find_args": "MODULE",
        "hash": "a0d2fa8c957704dd49e00a726284ac5ca034b50b00d2b20a94fa1bbfbb80841467834bfdc84aa0ed0d6aab894608fd6c86c3b94eee46343f0e6d9c22e391dbf9",
        "min_version": "1.3",
        "repo": "lsalzman/enet",
-        "version": "v1.3.18"
+        "tag": "v%VERSION%",
+        "version": "1.3.18"
    },
    "ffmpeg": {
+        "bundled": true,
        "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
        "repo": "FFmpeg/FFmpeg",
-        "version": "c7b5f1537d"
+        "sha": "c7b5f1537d",
+        "version": "8.0.1"
    },
    "ffmpeg-ci": {
        "ci": true,
@@ -89,20 +99,23 @@
        "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
        "min_version": "8",
        "repo": "fmtlib/fmt",
+        "tag": "%VERSION%",
        "version": "12.1.0"
    },
    "frozen": {
        "hash": "b8dfe741c82bc178dfc9749d4ab5a130cee718d9ee7b71d9b547cf5f7f23027ed0152ad250012a8546399fcc1e12187efc68d89d6731256c4d2df7d04eef8d5c",
        "package": "frozen",
        "repo": "serge-sans-paille/frozen",
-        "version": "61dce5ae18"
+        "sha": "61dce5ae18",
+        "version": "1.2.0"
    },
    "gamemode": {
        "find_args": "MODULE",
        "hash": "e87ec14ed3e826d578ebf095c41580069dda603792ba91efa84f45f4571a28f4d91889675055fd6f042d7dc25b0b9443daf70963ae463e38b11bcba95f4c65a9",
        "min_version": "1.7",
        "repo": "FeralInteractive/gamemode",
-        "version": "ce6fe122f3"
+        "sha": "ce6fe122f3",
+        "version": "1.8.2"
    },
    "httplib": {
        "find_args": "MODULE GLOBAL",
@@ -115,20 +128,23 @@
            "0001-mingw.patch"
        ],
        "repo": "yhirose/cpp-httplib",
-        "version": "v0.46.0"
+        "tag": "v%VERSION%",
+        "version": "0.46.0"
    },
    "lagoon": {
        "hash": "b9380f99c6effaeccc6d8f81d4942e852c11ad28613df637e155451556ae5826f93765bee57a5c87a9740d2bd1db463ad0f55a947772fe9d57eeabae3efa373e",
        "repo": "loongson-community/lagoon",
+        "tag": "%VERSION%",
        "version": "1.0.0"
    },
    "libadrenotools": {
        "hash": "f6526620cb752876edc5ed4c0925d57b873a8218ee09ad10859ee476e9333259784f61c1dcc55a2bcba597352d18aff22cd2e4c1925ec2ae94074e09d7da2265",
        "patches": [
-            "0001-use-cpmfile-def-for-linkernsbypass.patch"
+            "0001-linkerns-cpm.patch"
        ],
        "repo": "eden-emulator/libadrenotools",
-        "version": "8ba23b42d7"
+        "sha": "8ba23b42d7",
+        "version": "1.0.0"
    },
    "libusb": {
        "find_args": "MODULE",
@@ -137,52 +153,53 @@
            "0001-netbsd-gettime.patch"
        ],
        "repo": "libusb/libusb",
-        "version": "v1.0.29"
-    },
-    "linkernsbypass": {
-        "bundled": "true",
-        "hash": "bbe3f1f08e2bc7172b36e8f052912cc374289fc9a8e5a39ae7547a0c232de8f57ba24883451896b7a9a5d1be0e4de5c5b0f70c2022eda18d7d5a754847521800",
-        "repo": "bylaws/liblinkernsbypass",
-        "version": "aa3975893d"
+        "tag": "v%VERSION%",
+        "version": "1.0.29"
    },
    "llvm-mingw": {
        "artifact": "clang-rt-builtins.tar.zst",
        "git_host": "git.eden-emu.dev",
        "hash": "d902392caf94e84f223766e2cc51ca5fab6cae36ab8dc6ef9ef6a683ab1c483bfcfe291ef0bd38ab16a4ecc4078344fa8af72da2f225ab4c378dee23f6186181",
        "repo": "eden-emu/llvm-mingw",
+        "tag": "%VERSION%",
        "version": "20250828"
    },
    "lz4": {
        "hash": "35c21a5d9cfb5bbf314a5321d02b36819491d2ee3cf8007030ca09d13ca4dae672247b7aeab553e973093604fc48221cb03dc92197c6efe8fc3746891363fdab",
        "name": "lz4",
        "repo": "lz4/lz4",
+        "sha": "ebb370ca83",
        "source_subdir": "build/cmake",
-        "version": "ebb370ca83"
+        "version": "1.10.0"
    },
    "moltenvk": {
        "artifact": "MoltenVK-macOS.tar",
        "bundled": true,
        "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
        "repo": "V380-Ori/Ryujinx.MoltenVK",
-        "version": "v1.4.1-ryujinx"
+        "tag": "v%VERSION%-ryujinx",
+        "version": "1.4.1"
    },
    "nlohmann": {
        "hash": "6cc1e86261f8fac21cc17a33da3b6b3c3cd5c116755651642af3c9e99bb3538fd42c1bd50397a77c8fb6821bc62d90e6b91bcdde77a78f58f2416c62fc53b97d",
        "min_version": "3.8",
        "package": "nlohmann_json",
        "repo": "nlohmann/json",
-        "version": "v3.12.0"
+        "tag": "v%VERSION%",
+        "version": "3.12.0"
    },
    "oaknut": {
        "hash": "9697e80a7d5d9bcb3ce51051a9a24962fb90ca79d215f1f03ae6b58da8ba13a63b5dda1b4dde3d26ac6445029696b8ef2883f4e5a777b342bba01283ed293856",
        "min_version": "2.0.1",
        "repo": "eden-emulator/oaknut",
-        "version": "v2.0.3"
+        "tag": "v%VERSION%",
+        "version": "2.0.3"
    },
    "oboe": {
        "bundled": true,
        "hash": "ce4011afe7345370d4ead3b891cd69a5ef224b129535783586c0ca75051d303ed446e6c7f10bde8da31fff58d6e307f1732a3ffd03b249f9ef1fd48fd4132715",
        "repo": "google/oboe",
+        "tag": "%VERSION%",
        "version": "1.10.0"
    },
    "openssl": {
@@ -193,7 +210,8 @@
            "0001-add-bundled-cert.patch"
        ],
        "repo": "openssl/openssl",
-        "version": "openssl-3.6.2"
+        "tag": "openssl-%VERSION%",
+        "version": "3.6.2"
    },
    "openssl-ci": {
        "ci": true,
@@ -216,6 +234,7 @@
            "0004-use-shell-wrapper.patch"
        ],
        "repo": "jimmy-park/openssl-cmake",
+        "tag": "%VERSION%",
        "version": "3.6.2"
    },
    "opus": {
@@ -231,7 +250,8 @@
            "0002-no-install.patch"
        ],
        "repo": "xiph/opus",
-        "version": "a3f0ec02b3"
+        "sha": "a3f0ec02b3",
+        "version": "1.5.2"
    },
    "quazip": {
        "hash": "609c240c7f029ac26a37d8fbab51bc16284e05e128b78b9b9c0e95d083538c36047a67d682759ac990e4adb0eeb90f04f1ea7fe2253bbda7e7e3bcce32e53dd8",
@@ -244,14 +264,16 @@
        ],
        "package": "QuaZip-Qt6",
        "repo": "stachenov/quazip",
-        "version": "2e95c9001b"
+        "sha": "2e95c9001b",
+        "version": "1.5"
    },
    "sdl3": {
        "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3",
        "min_version": "3.2.10",
        "package": "SDL3",
        "repo": "libsdl-org/SDL",
-        "version": "release-3.4.8"
+        "tag": "release-%VERSION%",
+        "version": "3.4.8"
    },
    "sdl3-ci": {
        "ci": true,
@@ -266,16 +288,19 @@
        "hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
        "package": "SimpleIni",
        "repo": "brofield/simpleini",
-        "version": "v4.25"
+        "tag": "v%VERSION%",
+        "version": "4.25"
    },
    "sirit": {
+        "artifact": "sirit-source-%VERSION%.tar.zst",
        "find_args": "CONFIG",
-        "hash": "b7cd6885acae3fc8698288d19febba0dd45e4a02a2b6563d2eb995a988d0847046e8d16a5dea7e0bf832b4321bcec134cdbafc553f6ede039e4cf34525c5dce5",
        "options": [
            "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
        ],
        "repo": "eden-emulator/sirit",
-        "version": "v1.0.5"
+        "tag": "v%VERSION%",
+        "version": "1.0.5",
+        "hash": "10b3ff60bdcad428bb4f54360ff749212333a1d24c0b3ed99e466b1bfcf99d2db6cf596c0f965854a2095dfef9b7ce4e045edb070fa9f76eb3b295ab03a4a293"
    },
    "sirit-ci": {
        "ci": true,
@@ -285,13 +310,13 @@
        "version": "1.0.5"
    },
    "spirv-headers": {
-        "hash": "d624371dd455c66a300344c89812598ffe11b5eedba555779f789e85c29dc67317741858c60e0744a1e6755cc0d2759b8659f0674f4cc31479c4cb6fc25ed23b",
+        "hash": "cae8cd179c9013068876908fecc1d158168310ad6ac250398a41f0f5206ceff6469e2aaeab9c820bce9d1b08950c725c89c46e94b89a692be9805432cf749396",
        "options": [
            "SPIRV_WERROR OFF"
        ],
        "package": "SPIRV-Headers",
        "repo": "KhronosGroup/SPIRV-Headers",
-        "version": "vulkan-sdk-1.4.341.0"
+        "sha": "04f10f650d"
    },
    "tzdb": {
        "artifact": "%VERSION%.tar.gz",
@@ -299,6 +324,7 @@
        "hash": "cce65a12bf90f4ead43b24a0b95dfad77ac3d9bfbaaf66c55e6701346e7a1e44ca5d2f23f47ee35ee02271eb1082bf1762af207aad9fb236f1c8476812d008ed",
        "package": "nx_tzdb",
        "repo": "eden-emu/tzdb_to_nx",
+        "tag": "%VERSION%",
        "version": "230326"
    },
    "unordered-dense": {
@@ -310,40 +336,46 @@
            "0001-avoid-memset-when-clearing-an-empty-table.patch"
        ],
        "repo": "martinus/unordered_dense",
-        "version": "7b55cab841"
+        "sha": "7b55cab841",
+        "version": "4.8.1"
    },
    "vulkan-headers": {
        "hash": "d2846ea228415772645eea4b52a9efd33e6a563043dd3de059e798be6391a8f0ca089f455ae420ff22574939ed0f48ed7c6ff3d5a9987d5231dbf3b3f89b484b",
        "min_version": "1.4.317",
        "package": "VulkanHeaders",
        "repo": "KhronosGroup/Vulkan-Headers",
-        "version": "v1.4.345"
+        "tag": "v%VERSION%",
+        "version": "1.4.345"
    },
    "vulkan-memory-allocator": {
        "find_args": "CONFIG",
        "hash": "deb5902ef8db0e329fbd5f3f4385eb0e26bdd9f14f3a2334823fb3fe18f36bc5d235d620d6e5f6fe3551ec3ea7038638899db8778c09f6d5c278f5ff95c3344b",
        "package": "VulkanMemoryAllocator",
        "repo": "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator",
-        "version": "v3.3.0"
+        "tag": "v%VERSION%",
+        "version": "3.3.0"
    },
    "vulkan-utility-libraries": {
        "hash": "114f6b237a6dcba923ccc576befb5dea3f1c9b3a30de7dc741f234a831d1c2d52d8a224afb37dd57dffca67ac0df461eaaab6a5ab5e503b393f91c166680c3e1",
        "package": "VulkanUtilityLibraries",
        "repo": "KhronosGroup/Vulkan-Utility-Libraries",
-        "version": "v1.4.345"
+        "tag": "v%VERSION%",
+        "version": "1.4.345"
    },
    "vulkan-validation-layers": {
-        "artifact": "android-binaries-%NUMERIC_VERSION%.zip",
+        "artifact": "android-binaries-%VERSION%.zip",
        "hash": "8812ae84cbe49e6a3418ade9c458d3be6d74a3dffd319d4502007b564d580998056e8190414368ec11b27bc83993c7a0dad713c31bcc3d9553b51243efee3753",
-        "numeric_version": "1.4.341.0",
+        "package": "VVL",
        "repo": "KhronosGroup/Vulkan-ValidationLayers",
-        "version": "vulkan-sdk-%NUMERIC_VERSION%"
+        "tag": "vulkan-sdk-%VERSION%",
+        "version": "1.4.341.0"
    },
    "xbyak": {
        "hash": "b6475276b2faaeb315734ea8f4f8bd87ededcee768961b39679bee547e7f3e98884d8b7851e176d861dab30a80a76e6ea302f8c111483607dde969b4797ea95a",
        "package": "xbyak",
        "repo": "herumi/xbyak",
-        "version": "v7.35.2"
+        "tag": "v%VERSION%",
+        "version": "7.35.2"
    },
    "zlib": {
        "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
@@ -354,7 +386,8 @@
        ],
        "package": "ZLIB",
        "repo": "madler/zlib",
-        "version": "v1.3.2"
+        "tag": "v%VERSION%",
+        "version": "1.3.2"
    },
    "zstd": {
        "find_args": "MODULE",
@@ -364,7 +397,8 @@
            "ZSTD_BUILD_SHARED OFF"
        ],
        "repo": "facebook/zstd",
+        "sha": "b8d6101fba",
        "source_subdir": "build/cmake",
-        "version": "b8d6101fba"
+        "version": "1.5.7"
    }
 }
@@ -8,7 +8,6 @@ CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful u
  - [Common Properties](#common-properties)
  - [Standard Packages](#standard-packages)
    - [Versioning](#versioning)
-    - [Artifact Naming Errata](#artifact-naming-errata)
    - [Patches](#patches)
  - [Pre-built CI Packages](#pre-built-ci-packages)
  - [Usage](#usage)
@@ -23,18 +22,12 @@ CPMUtil is a wrapper around CPM that aims to reduce boilerplate and add useful u
  - [Addendum: Module Path Packages](#addendum-module-path-packages)
    - [Example: OpenSSL](#example-openssl)
  - [Addendum: Adding Qt](#addendum-adding-qt)
-  - [Addendum: Package-Specific Overrides](#addendum-package-specific-overrides)
-  - [Addendum: Supply-Chain Security](#addendum-supply-chain-security)
-    - [Checksumming](#checksumming)
-    - [Caching](#caching)
-    - [Immutable Commit Hashes](#immutable-commit-hashes)

 ## Global Options

- `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages.
-  - You may optionally override this for each package: [Package-Specific Overrides](#addendum-package-specific-overrides)
+- `CPMUTIL_FORCE_SYSTEM` (default `OFF`): Require all CPM dependencies to use system packages. NOT RECOMMENDED!
+  - You may optionally override this (section)
 - `CPMUTIL_FORCE_BUNDLED` (default `ON` on MSVC and Android, `OFF` elsewhere): Require all CPM dependencies to use bundled packages.
-  - You may optionally override this for each package: [Package-Specific Overrides](#addendum-package-specific-overrides)
 - `CPMUTIL_PATCH_DIR` (default `${PROJECT_SOURCE_DIR}/.patch`): Path to patches used in packages. Stored as `<PATCH DIR>/json-package-name/0001-patch-name.patch`, etc.
 - `CPM_SOURCE_CACHE` (default `${PROJECT_SOURCE_DIR}/.cache/cpm`): Where downloaded dependencies get stored.

@@ -57,25 +50,23 @@ And may optionally define other properties like:
 For instance:

 ```json
-{
-  "fmt": {
-      "repo": "fmtlib/fmt",
-      "version": "12.1.0",
-      "hash": "f0da8...23f2",
-      "min_version": "8",
-      "options": [
-          "FMT_TEST ON"
-      ],
-      "patches": [
-         "0001-disable-reference-copy.patch"
-      ]
-  }
+"fmt": {
+    "repo": "fmtlib/fmt",
+    "tag": "12.1.0",
+    "hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
+    "min_version": "8",
+    "options": [
+      "FMT_TEST ON"
+    ],
+    "patches": [
+      "0001-disable-reference-copy.patch"
+    ]
 }
 ```

 Calling `AddJsonPackage(fmt)`:

- Searches for a system package named `fmt` of version 8 or higher (`find_package(fmt 8)`)
+- Searches for a system package named `fmt` of version 8 or higher
 - If found, uses the system package and caches it for future use
 - If not found:
  - Downloads fmt 12.1.0 from the GitHub Archive into `.cache/cpm/fmt/12.1.0`
@@ -94,82 +85,63 @@ These JSON properties are used by standard and CI packages alike.
 - `package`: The package name used by `find_package` to check for the existence of a system package.
  - If unset, defaults to the JSON key
 - `repo`: The Git repository the package is stored in, if applicable.
- `version`: The version of the package. This is required.
-  - Generally, this should be a 10-wide Git commit hash or Git tag.
-  - Tags must be fully qualified and include prefixes and suffixes, e.g. `boost-1.88.0`
+- `version`: The version of the package to download. This is required.
+- `min_version`: The minimum required version of the package, if a system package is desired.
 - `git_host`: The Git host the package is stored in, if applicable. Defaults to `github.com`.

 ## Standard Packages

 Normal packages, like the prior `fmt` example, *must* also define:

- `hash`: The SHA512 hash of the downloaded artifact. CPMUtil generally computes this for you--if not, use `tools/cpmutil.sh package hash <JSON key>`
- `min_version`: The minimum required version of the package, if a system package is desired.
-
-And may optionally define:
-
- `url`: Download from a raw URL.
- `artifact`: A GitHub/Forgejo/Gitea release artifact. Requires `repo` to be set and valid.
- `numeric_version`: Replaces `%NUMERIC_VERSION%` in artifact and version definitions; see [Artifact Naming Errata](#artifact-naming-errata).
-
-See [Versioning](#versioning) for version/artifact information.
+- `hash`: The SHA512 hash of the downloaded artifact. CPMUtil generally computes this for you.
+- A valid version/URL identifier:
+  - `url`: Download from a raw URL.
+  - `sha`: A short or fully-qualified Git commit sha. CPMUtil recommends using 10-character wide shas.
+  - `tag`: A Git tag. See [Versioning](#versioning) for its relation to `version`.
+  - `artifact`: A GitHub/Forgejo/Gitea release artifact (requires `tag`). See [Versioning](#versioning) for its relation to `tag` and `version`.

 The following are optional to define:

 - `source_subdir`: A subdirectory containing the `CMakeLists.txt` to configure a project. Useful for projects like `zstd`.
- `bundled`: Force the usage of a bundled package. Useful for packages where the system package is broken or nonexistent; e.g. external fragment shaders or data archives.
-  - Note that this will conflict with `CPMUTIL_FORCE_SYSTEM`; for this reason, when using non-library archives, it may be best to allow the user to download and extract the archive manually and specify a local directory to it.
+- `bundled`: Force the usage of a bundled package. Useful for packages where the system package is broken or nonexistent; e.g. including external fragment shaders.
 - `find_args`: Additional arguments passed to `find_package`, e.g. `MODULE`
 - `patches`: Array of in-tree patches to apply to the downloaded source code. See [#Patches](TODO).
 - `options`: Array of CMake options to apply before configuring the package, e.g. `"FMT_TEST ON"`.

 ### Versioning

-When fetching from a Git repository, there are generally three methods of versioning:
+When using tags or artifacts, it may be cumbersome to repeat the version multiple times; especially if it's constantly changing. For this purpose, `tag` and `artifact` both support basic version text replacement.

- Commit hashes
- Git tags
- Release artifacts
+`tag` can use `%VERSION%` to have its version replaced with the `version` defined for the package, e.g. for OpenSSL; when downloading, `tag` will evaluate to `openssl-3.6.2`:

-When `repo` is set, `version` field can be set to any commitish value, including commit hashes or Git tags. In the case of artifacts, `version` must be a Git tag, and `artifact` must be set to a release artifact attached to that tag. Many repositories intentionally version the filenames of their release artifacts; for this purpose, CPMUtil allows you to implant the version number into the artifact name. To do so, add `%VERSION%` to the artifact name; CPMUtil will then automatically replace `%VERSION%` with the `version` field. This means that when changing versions, you only need to update the version, not the artifact!
+```json
+"openssl": {
+    "repo": "openssl/openssl",
+    "version": "3.6.2",
+    "tag": "openssl-%VERSION%"
+}
+```

-Take Boost as an example. The artifact for Boost 1.90.0 is `boost-1.90.0-cmake.tar.xz`, and the tag is `boost-1.90.0`. Thus, we can set the artifact to `%VERSION%-cmake.tar.xz`:
+`artifact` also supports `%VERSION%` replacement, and can also use `%TAG%` to be replaced by the computed tag. Take this Boost definition:

 ```json
 "boost": {
    "repo": "boostorg/boost",
-    "version": "boost-1.90.0",
-    "artifact": "%VERSION%-cmake.tar.xz"
+    "tag": "boost-%VERSION%",
+    "version": "1.90.0"
 }
 ```

-The artifact will then evaluate as `boost-1.90.0-cmake.tar.xz`.
+Boost's artifact for this version is stored in `boost-1.90.0-cmake.tar.xz`. Notice that the computed tag,`boost-1.90.0`, is in the name of the artifact! Thus, `artifact` can be either:

-### Artifact Naming Errata
+- `boost-%VERSION%-cmake.tar.xz`
+- Or, even simpler: `%TAG%-cmake.tar.xz`

-While `%VERSION%` replacement is generally good enough for well-packaged projects, occasionally there may be some problematic packages. Take, for instance, Vulkan Validation Layers:
-
- Tag (`version`): `vulkan-sdk-1.4.341.0`
- Artifact: `android-binaries-1.4.341.0.zip`
-
-Attempting to add version replacement to the artifact definition **would not work here!** In this case, you must utilize the `numeric_version` field described earlier; we would set `numeric_version` to `1.4.341.0` and add `%NUMERIC_VERSION%` replacements into our artifact and version fields:
-
-```json
-"vulkan-validation-layers": {
-    "artifact": "android-binaries-%NUMERIC_VERSION%.zip",
-    "repo": "KhronosGroup/Vulkan-ValidationLayers",
-    "version": "vulkan-sdk-%NUMERIC_VERSION%",
-    "numeric_version": "1.4.341.0"
-},
-```
-
-`artifact` will thus evaluate to `android-binaries-1.4.341.0.zip`, and `version` to `vulkan-sdk-1.4.341.0`. CPMUtil's auto-updater will also account for this and only update `numeric_version`!
+Future updates need only change the `version` identifier, and the artifact and tag will automatically be updated!

 ### Patches

-CPMUtil is able to apply in-place source tree patches to downloaded packages. These are defined in JSON as an array of names, preferably using `git-format-patch`'s scheme of `<4 digit number>-patch-name.patch`.
-
-They are stored in `<CPMUTIL_PATCH_DIR>/<json-key>` (remember that `CPMUTIL_PATCH_DIR` defaults to `$ROOT/.patch`); e.g. `boost` patches would be in `.patch/boost`. Let's say we've made three patches and want to add them; in the Boost JSON definition, we would add:
+CPMUtil is able to apply in-place source tree patches to downloaded packages. These are defined in JSON as an array of names, preferably using `git-format-patch`'s scheme of `<4 digit number>-patch-name.patch`. These are stored in `<CPMUTIL_PATCH_DIR>/<json-key>` (remember that `CPMUTIL_PATCH_DIR` defaults to `$ROOT/.patch`); e.g. `boost` patches would be in `.patch/boost`. Let's say we've made three patches and want to add them; in the Boost JSON definition, we would add:

 ```json
 "patches": [
@@ -179,7 +151,7 @@ They are stored in `<CPMUTIL_PATCH_DIR>/<json-key>` (remember that `CPMUTIL_PATC
 ]
 ```

-Then, when Boost is downloaded, it will apply these patches to the source tree in the order they are defined (compound/dependent patches are okay!). Note that when you add, remove, or modify patches, CPMUtil will invalidate your downloaded cache and re-fetch the source.
+Then, when Boost is downloaded, it will apply these patches in order to the source tree.

 To learn how to make patches, see [Addendum: Making Patches](#addendum-making-patches).

@@ -227,9 +199,12 @@ If you're only concerned with basic usage, you can stop reading. For more advanc

 CPMUtil stores downloaded packages within `.cache/cpm` by default (see `CPM_SOURCE_CACHE`). Subdirectories stored within are lowercase representations of the `find_package` name for the package; for instance, a `vulkan-headers` definition with `package: "VulkanHeaders"` would be stored in `.cache/cpm/vulkanheaders`.

-Within these subdirectories, additional directories are created for each individual version, corresponding directly to their `version` field. CI packages use `<platform>-<architecture>-<version>` unconditionally.
+Within these subdirectories, additional directories are created for each individual version:

-To see the cache directory for a given package, use `tools/cpmutil.sh package dir <JSON key>`.
+- A four-character shorthand of `sha`, if defined
+- If `sha` is not defined, the fully qualified `version` is used
+
+CI packages use `<platform>-<architecture>-<version>` unconditionally.

 ## Addendum: Making Patches

@@ -267,7 +242,7 @@ If you are packaging a project that uses CPMUtil, read this!

 For sandboxed environments (e.g. Gentoo, nixOS) you must install all dependencies to the system beforehand and set `-DCPMUTIL_FORCE_SYSTEM=ON`. If a dependency is missing, get creating!

-Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-D<PackageName>_CUSTOM_DIR=/path/to/downloaded/dir`.
+Alternatively, if CPMUtil pulls in a package that has no suitable way to install or use a system version, download it separately and pass `-DPackageName_DIR=/path/to/downloaded/dir` (e.g. shaders)

 ### Unsandboxed

@@ -288,12 +263,14 @@ Using the prior Vulkan example:
    "repo": "KhronosGroup/Vulkan-Headers",
    "package": "VulkanHeaders",
    "min_version": "1.4.317",
-    "version": "v1.4.342"
+    "version": "1.4.342",
+    "tag": "v%VERSION%"
 },
 "vulkan-utility-libraries": {
    "repo": "KhronosGroup/Vulkan-Utility-Libraries",
    "package": "VulkanUtilityLibraries",
-    "version": "v1.4.342"
+    "version": "1.4.342",
+    "tag": "v%VERSION%"
 }
 ```

@@ -341,32 +318,3 @@ AddQt(QDash-CI/Qt 6.11.1)
 ```

 Then, call `find_package(Qt6 ...)` and it will pull Qt from your downloaded source.
-
-## Addendum: Package-Specific Overrides
-
-There are three variables that CPMUtil defines for each package; these can be overriden by the user or in your CMake. `package` refers either to the `package` value in the JSON, or the package's JSON key if unset (see `package` in [Common Properties](#common-properties)):
-
- `<package>_FORCE_BUNDLED`: Forcefully bundle the package. This has the same effect as `CPMUTIL_FORCE_BUNDLED`, but only for this package.
- `<package>_FORCE_BUNDLED`: Forcefully use the system package, failing if it can't be found. This has the same effect as `SYSTEM`, but only for this package.
- `<package>_CUSTOM_DIR`: Path to an extracted copy of the package. CPMUtil will not attempt to download the package and will instead use the custom directory.
-  - For an example, see [CPMUtil's test case](https://git.crueter.xyz/CMake/CPMUtil/src/branch/master/tests/dir/CMakeLists.txt)
-
-Additionally, in CMake, you can add `FORCE_BUNDLED_PACKAGE ON` to your `AddJsonPackage` command--note that you will have to use the `NAME <key>` syntax as described in [Module Path Packages](#addendum-module-path-packages). This will overrule *all* other overrides, including `CPMUTIL_FORCE_SYSTEM` and `<package>_FORCE_SYSTEM`--use with caution!
-
-## Addendum: Supply-Chain Security
-
-Many package managers suffer from the issue of supply chain security, specifically in regards to silent overwrites of existing packages or archives, e.g. tag sliding and artifact overwriting. CPMUtil has three methods to protect against this.
-
-### Checksumming
-
-CPMUtil *requires* SHA512 checksums for standard packages, and soon will for CI packages as well. If an attacker or compromised account slides a tag, overwrites a release artifact, or otherwise attempts to compromise anything that CPMUtil may fetch, **CPMUtil will not allow the download to continue!** This means that consumers of your build system can **only** download an artifact if the contents of the artifact are *exactly* indentical to what it was when it was configured--any changes at all will be rejected by CPMUtil.
-
-### Caching
-
-CPMUtil uses a mutable cache system, stored by default in `.cache/cpm`. Dependencies are downloaded and extracted here, and can be reused infinitely. This means that, for instance, if a package is compromised but you already have a cached local copy, you won't have to worry at all!
-
-### Immutable Commit Hashes
-
-CPMUtil is capable of using immutable Git commit hashes for its artifacts. These are (barring SHA1 collisions) completely immune to supply chain attacks--that is, unless the entire root server gets compromised to serve infected artifacts/source code; at which point there are much larger issues to worry about. This means that once you set a package to use a Git commit hash for its version, **it will stay the same forever**. This is useful if you want to ensure that consumers are never faced with download failures stemming from hash mismatches in case of compromised artifacts.
-
-Do note, however, that this will render the package incompatible with CPMUtil's built-in auto-updater, so you will have to manually update the package.
@@ -269,7 +269,7 @@ class SettingsFragmentPresenter(
    // TODO(crueter): sub-submenus?
    private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
        sl.apply {
-            add(IntSetting.RENDERER_NVDEC_EMULATION.key)
+            // add(IntSetting.RENDERER_NVDEC_EMULATION.key)

            add(IntSetting.RENDERER_RESOLUTION.key)
            add(IntSetting.RENDERER_VSYNC.key)
@@ -27,7 +27,7 @@ if (ARCHITECTURE_arm64)
    target_link_libraries(yuzu-android PRIVATE adrenotools)
 endif()

-target_link_libraries(yuzu-android PRIVATE FFmpeg::FFmpeg OpenSSL::SSL cpp-jwt::cpp-jwt)
+target_link_libraries(yuzu-android PRIVATE OpenSSL::SSL cpp-jwt::cpp-jwt)
 if (ENABLE_UPDATE_CHECKER)
    target_compile_definitions(yuzu-android PUBLIC ENABLE_UPDATE_CHECKER)
 endif()
@@ -36,12 +36,6 @@
 #include <frontend_common/content_manager.h>
 #include <jni.h>

-extern "C" {
-// Required for FFmpeg mediacodec
-#include <libavcodec/jni.h>
-#include <libavutil/log.h>
-}
-
 #include "common/android/multiplayer/multiplayer.h"
 #include "common/android/android_common.h"
 #include "common/android/id_cache.h"
@@ -686,15 +680,6 @@ const char* fallback_cpu_detection() {

 } // namespace

-// referenced by common
-extern "C" {
-jint InitFFmpegOnLoad(JavaVM *vm) {
-    av_jni_set_java_vm(vm, NULL);
-    av_log_set_level(AV_LOG_DEBUG);
-    return 0;
-}
-}
-
 extern "C" {

 void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject instance,
@@ -12,6 +12,7 @@
 #include "common/android/multiplayer/multiplayer.h"
 #include <network/network.h>

+
 static JavaVM *s_java_vm;
 static jclass s_native_library_class;
 static jclass s_disk_cache_progress_class;
@@ -426,12 +427,8 @@ namespace Common::Android {
    extern "C" {
 #endif

-    // see on src/android/app/src/main/jni/native.cpp
-    jint InitFFmpegOnLoad(JavaVM *vm);
-
    jint JNI_OnLoad(JavaVM *vm, void *reserved) {
        s_java_vm = vm;
-        InitFFmpegOnLoad(vm);

        JNIEnv *env;
        if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION) != JNI_OK)
@@ -20,53 +20,58 @@ Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, const Host1x::NvdecCommon::Nv

 Decoder::~Decoder() = default;

-void Decoder::SetFrameDimensions(s32 width, s32 height) {
-    if (width <= 0 || height <= 0) {
-        frame_dimensions.reset();
-        return;
-    }
-    frame_dimensions = FFmpeg::FrameDimensions{width, height};
-}
-
 void Decoder::Decode() {
    if (!initialized) {
        return;
    }

    const auto packet_data = ComposeFrame();
-    FFmpeg::FrameOffsets offsets{};
-    offsets.hidden = vp9_hidden_frame;
-    offsets.interlaced = IsInterlaced();
-    if (offsets.interlaced) {
-        std::tie(offsets.luma, offsets.luma_bottom, std::ignore, std::ignore) =
-            GetInterlacedOffsets();
-    } else {
-        std::tie(offsets.luma, std::ignore) = GetProgressiveOffsets();
-    }
-
-    if (!decode_api.SendPacket(packet_data, offsets, GetFrameDimensions())) {
+    // Send assembled bitstream to decoder.
+    if (!decode_api.SendPacket(packet_data)) {
        return;
    }

-    auto push = [&](u64 luma, std::shared_ptr<FFmpeg::Frame> frame) {
-        if (UsingDecodeOrder()) {
-            host1x.frame_queue.PushDecodeOrder(id, luma, std::move(frame));
-        } else {
-            host1x.frame_queue.PushPresentOrder(id, luma, std::move(frame));
-        }
-    };
+    // Only receive/store visible frames.
+    if (vp9_hidden_frame) {
+        return;
+    }

-    while (auto result = decode_api.ReceiveFrame()) {
-        auto& [frame, o] = *result;
-        if (o.hidden || !frame) {
-            continue;
+    // Receive output frames from decoder.
+    auto frame = decode_api.ReceiveFrame();
+
+    if (!frame) {
+        return;
+    }
+
+    if (IsInterlaced()) {
+        auto [luma_top, luma_bottom, chroma_top, chroma_bottom] = GetInterlacedOffsets();
+        auto frame_copy = frame;
+
+        if (!frame.get()) {
+            LOG_ERROR(HW_GPU,
+                      "Nvdec {} failed to decode interlaced frame for top {:#X} bottom 0x{:X}", id,
+                      luma_top, luma_bottom);
        }
-        if (o.interlaced) {
-            auto frame_copy = frame;
-            push(o.luma, std::move(frame));
-            push(o.luma_bottom, std::move(frame_copy));
+
+        if (UsingDecodeOrder()) {
+            host1x.frame_queue.PushDecodeOrder(id, luma_top, std::move(frame));
+            host1x.frame_queue.PushDecodeOrder(id, luma_bottom, std::move(frame_copy));
        } else {
-            push(o.luma, std::move(frame));
+            host1x.frame_queue.PushPresentOrder(id, luma_top, std::move(frame));
+            host1x.frame_queue.PushPresentOrder(id, luma_bottom, std::move(frame_copy));
+        }
+    } else {
+        auto [luma_offset, chroma_offset] = GetProgressiveOffsets();
+
+        if (!frame.get()) {
+            LOG_ERROR(HW_GPU, "Nvdec {} failed to decode progressive frame for luma {:#X}", id,
+                      luma_offset);
+        }
+
+        if (UsingDecodeOrder()) {
+            host1x.frame_queue.PushDecodeOrder(id, luma_offset, std::move(frame));
+        } else {
+            host1x.frame_queue.PushPresentOrder(id, luma_offset, std::move(frame));
        }
    }
 }
@@ -10,7 +10,6 @@
 #include <mutex>
 #include <optional>
 #include <string_view>
-#include <tuple>
 #include <ankerl/unordered_dense.h>
 #include <queue>

@@ -47,19 +46,12 @@ protected:
    virtual std::tuple<u64, u64, u64, u64> GetInterlacedOffsets() = 0;
    virtual bool IsInterlaced() = 0;

-    void SetFrameDimensions(s32 width, s32 height);
-
-    std::optional<FFmpeg::FrameDimensions> GetFrameDimensions() const {
-        return frame_dimensions;
-    }
-
    FFmpeg::DecodeApi decode_api;
    Host1x::Host1x& host1x;
    const Host1x::NvdecCommon::NvdecRegisters& regs;
    s32 id;
    bool initialized : 1 = false;
    bool vp9_hidden_frame : 1 = false;
-    std::optional<FFmpeg::FrameDimensions> frame_dimensions;
 };

 } // namespace Tegra
@@ -52,10 +52,6 @@ bool H264::IsInterlaced() {

 std::span<const u8> H264::ComposeFrame() {
    host1x.gmmu_manager.ReadBlock(regs.picture_info_offset.Address(), &current_context, sizeof(H264DecoderContext));
-    const auto& params = current_context.h264_parameter_set;
-    SetFrameDimensions(static_cast<s32>(params.pic_width_in_mbs) * 16,
-                       static_cast<s32>(params.frame_height_in_mbs) * 16);
-
    const s64 frame_number = current_context.h264_parameter_set.frame_number.Value();
    if (!is_first_frame && frame_number != 0) {
        frame_scratch.resize_destructive(current_context.stream_len);
@@ -35,7 +35,6 @@ std::tuple<u64, u64, u64, u64> VP8::GetInterlacedOffsets() {

 std::span<const u8> VP8::ComposeFrame() {
    host1x.gmmu_manager.ReadBlock(regs.picture_info_offset.Address(), &current_context, sizeof(VP8PictureInfo));
-    SetFrameDimensions(current_context.frame_width, current_context.frame_height);

    const bool is_key_frame = current_context.key_frame == 1u;
    const auto bitstream_size = size_t(current_context.vld_buffer_size);
@@ -841,7 +841,6 @@ std::span<const u8> VP9::ComposeFrame() {
    {
        Vp9FrameContainer curr_frame = GetCurrentFrame();
        current_frame_info = curr_frame.info;
-        SetFrameDimensions(current_frame_info.frame_size.width, current_frame_info.frame_size.height);
        bitstream = std::move(curr_frame.bit_stream);
    }
    // The uncompressed header routine sets PrevProb parameters needed for the compressed header
@@ -4,11 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <cstring>
-#include <string>
-#include <string_view>
-#include <vector>
-
 #include "common/assert.h"
 #include "common/logging.h"
 #include "common/scope_exit.h"
@@ -24,16 +19,15 @@ extern "C" {
 #endif

 #include <libavutil/hwcontext.h>
-#include <libavutil/log.h>
 }

 namespace FFmpeg {

 namespace {

-constexpr AVPixelFormat PREFERRED_GPU_FORMAT = AV_PIX_FMT_NV12;
-constexpr AVPixelFormat PREFERRED_CPU_FORMAT = AV_PIX_FMT_YUV420P;
-constexpr std::array PREFERRED_GPU_DECODERS = {
+constexpr AVPixelFormat PreferredGpuFormat = AV_PIX_FMT_NV12;
+constexpr AVPixelFormat PreferredCpuFormat = AV_PIX_FMT_YUV420P;
+constexpr std::array PreferredGpuDecoders = {
 #if defined(_WIN32)
    AV_HWDEVICE_TYPE_CUDA,
    AV_HWDEVICE_TYPE_D3D11VA,
@@ -60,14 +54,15 @@ AVPixelFormat GetGpuFormat(AVCodecContext* codec_context, const AVPixelFormat* p
    if (desc && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) {
        for (int i = 0;; i++) {
            const AVCodecHWConfig* config = avcodec_get_hw_config(codec_context->codec, i);
-            if (config) {
-                for (const auto type : PREFERRED_GPU_DECODERS)
-                    if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX && config->device_type == type) {
-                        codec_context->pix_fmt = config->pix_fmt;
-                    }
-            } else {
+            if (!config) {
                break;
            }
+
+            for (const auto type : PreferredGpuDecoders) {
+                if (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX && config->device_type == type) {
+                    codec_context->pix_fmt = config->pix_fmt;
+                }
+            }
        }
    }

@@ -79,7 +74,7 @@ AVPixelFormat GetGpuFormat(AVCodecContext* codec_context, const AVPixelFormat* p

    LOG_INFO(HW_GPU, "Could not find supported GPU pixel format, falling back to CPU decoder");
    av_buffer_unref(&codec_context->hw_device_ctx);
-    codec_context->pix_fmt = PREFERRED_CPU_FORMAT;
+    codec_context->pix_fmt = PreferredCpuFormat;
    return codec_context->pix_fmt;
 }

@@ -89,57 +84,6 @@ std::string AVError(int errnum) {
    return errbuf;
 }

-#ifdef __ANDROID__
-// Match a 3- or 4-byte annex-B NAL start code at `i`. Returns its length, or 0.
-size_t FindNalStartCode(std::span<const u8> data, size_t i) {
-    const size_t n = data.size();
-    if (i + 3 < n && data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 0 && data[i + 3] == 1) {
-        return 4;
-    }
-    if (i + 2 < n && data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
-        return 3;
-    }
-    return 0;
-}
-
-// Pull SPS (NAL type 7) + PPS (NAL type 8) out of an annex-B frame into an
-// extradata buffer, each prefixed with a 4-byte start code. Eden synthesizes
-// these inline into the very first frame; h264_mediacodec wants them at open.
-std::vector<u8> ExtractH264ParameterSetExtradata(std::span<const u8> packet) {
-    std::vector<u8> extradata;
-    const size_t size = packet.size();
-    size_t i = 0;
-    while (i < size) {
-        const size_t sc = FindNalStartCode(packet, i);
-        if (sc == 0) {
-            ++i;
-            continue;
-        }
-        const size_t nal_start = i + sc;
-        if (nal_start >= size) {
-            break;
-        }
-        const u8 nal_type = packet[nal_start] & 0x1F;
-
-        size_t j = nal_start + 1;
-        while (j < size && FindNalStartCode(packet, j) == 0) {
-            ++j;
-        }
-
-        if (nal_type == 7 || nal_type == 8) {
-            constexpr u8 start[4] = {0, 0, 0, 1};
-            extradata.insert(extradata.end(), start, start + sizeof(start));
-            extradata.insert(extradata.end(), packet.begin() + nal_start, packet.begin() + j);
-        } else if (nal_type == 1 || nal_type == 5) {
-            break;
-        }
-        i = j;
-    }
-    return extradata;
-}
-
-#endif
-
 }

 Packet::Packet(std::span<const u8> data) {
@@ -174,26 +118,7 @@ Decoder::Decoder(Tegra::Host1x::NvdecCommon::VideoCodec codec) {
            return AV_CODEC_ID_NONE;
        }
    }();
-
-#ifdef __ANDROID__
-    // FFmpeg exposes MediaCodec via dedicated decoders rather than as a
-    // hw_config on the regular ones.
-    if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::Gpu) {
-        const char* mc_name = nullptr;
-        switch (av_codec) {
-        case AV_CODEC_ID_H264: mc_name = "h264_mediacodec"; break;
-        case AV_CODEC_ID_VP8:  mc_name = "vp8_mediacodec";  break;
-        case AV_CODEC_ID_VP9:  mc_name = "vp9_mediacodec";  break;
-        default: break;
-        }
-        if (mc_name) {
-            m_codec = avcodec_find_decoder_by_name(mc_name);
-        }
-    }
-#endif
-    if (!m_codec) {
-        m_codec = avcodec_find_decoder(av_codec);
-    }
+    m_codec = avcodec_find_decoder(av_codec);
 }

 bool Decoder::SupportsDecodingOnDevice(AVPixelFormat* out_pix_fmt, AVHWDeviceType type) const {
@@ -217,10 +142,13 @@ bool Decoder::SupportsDecodingOnDevice(AVPixelFormat* out_pix_fmt, AVHWDeviceTyp
 std::vector<AVHWDeviceType> HardwareContext::GetSupportedDeviceTypes() {
    std::vector<AVHWDeviceType> types;
    AVHWDeviceType current_device_type = AV_HWDEVICE_TYPE_NONE;
+
    while (true) {
        current_device_type = av_hwdevice_iterate_types(current_device_type);
-        if (current_device_type == AV_HWDEVICE_TYPE_NONE)
+        if (current_device_type == AV_HWDEVICE_TYPE_NONE) {
            return types;
+        }
+
        types.push_back(current_device_type);
    }
 }
@@ -230,20 +158,25 @@ HardwareContext::~HardwareContext() {
 }

 bool HardwareContext::InitializeForDecoder(DecoderContext& decoder_context, const Decoder& decoder) {
-    auto const supported_types = GetSupportedDeviceTypes();
-    for (auto const type : PREFERRED_GPU_DECODERS) {
+    const auto supported_types = GetSupportedDeviceTypes();
+    for (const auto type : PreferredGpuDecoders) {
+        AVPixelFormat hw_pix_fmt;
+
        if (std::ranges::find(supported_types, type) == supported_types.end()) {
            LOG_DEBUG(HW_GPU, "{} explicitly unsupported", av_hwdevice_get_type_name(type));
            continue;
        }
-        if (InitializeWithType(type)) {
-            AVPixelFormat hw_pix_fmt{};
-            if (decoder.SupportsDecodingOnDevice(&hw_pix_fmt, type)) {
-                decoder_context.InitializeHardwareDecoder(*this, hw_pix_fmt);
-                return true;
-            }
+
+        if (!this->InitializeWithType(type)) {
+            continue;
+        }
+
+        if (decoder.SupportsDecodingOnDevice(&hw_pix_fmt, type)) {
+            decoder_context.InitializeHardwareDecoder(*this, hw_pix_fmt);
+            return true;
        }
    }
+
    return false;
 }

@@ -251,7 +184,7 @@ bool HardwareContext::InitializeWithType(AVHWDeviceType type) {
    av_buffer_unref(&m_gpu_decoder);

    if (const int ret = av_hwdevice_ctx_create(&m_gpu_decoder, type, nullptr, nullptr, 0); ret < 0) {
-        LOG_INFO(HW_GPU, "av_hwdevice_ctx_create({}) failed: {}", av_hwdevice_get_type_name(type), AVError(ret));
+        LOG_DEBUG(HW_GPU, "av_hwdevice_ctx_create({}) failed: {}", av_hwdevice_get_type_name(type), AVError(ret));
        return false;
    }

@@ -281,9 +214,6 @@ DecoderContext::DecoderContext(const Decoder& decoder) : m_decoder{decoder} {
    av_opt_set(m_codec_context->priv_data, "tune", "zerolatency", 0);
    m_codec_context->thread_count = 0;
    m_codec_context->thread_type &= ~FF_THREAD_FRAME;
-    // Forwarded into MediaCodec as KEY_LOW_LATENCY on Android.
-    m_codec_context->flags |= AV_CODEC_FLAG_LOW_DELAY;
-    m_codec_context->flags2 |= AV_CODEC_FLAG2_FAST;
 }

 DecoderContext::~DecoderContext() {
@@ -297,19 +227,7 @@ void DecoderContext::InitializeHardwareDecoder(const HardwareContext& context, A
    m_codec_context->pix_fmt = hw_pix_fmt;
 }

-bool DecoderContext::OpenContext(const Decoder& decoder, std::span<const u8> extradata) {
-    if (!extradata.empty()) {
-        av_freep(&m_codec_context->extradata);
-        m_codec_context->extradata = static_cast<u8*>(
-            av_mallocz(extradata.size() + AV_INPUT_BUFFER_PADDING_SIZE));
-        if (!m_codec_context->extradata) {
-            LOG_ERROR(HW_GPU, "Failed to allocate extradata");
-            return false;
-        }
-        std::memcpy(m_codec_context->extradata, extradata.data(), extradata.size());
-        m_codec_context->extradata_size = static_cast<int>(extradata.size());
-    }
-
+bool DecoderContext::OpenContext(const Decoder& decoder) {
    if (const int ret = avcodec_open2(m_codec_context, decoder.GetCodec(), nullptr); ret < 0) {
        LOG_ERROR(HW_GPU, "avcodec_open2 error: {}", AVError(ret));
        return false;
@@ -347,17 +265,11 @@ std::shared_ptr<Frame> DecoderContext::ReceiveFrame() {

    m_final_frame = std::make_shared<Frame>();
    if (m_codec_context->hw_device_ctx) {
-#ifdef __ANDROID__
-        // c2.mtk.vp9.decoder, c2.mtk.vp89.decoder will be fine if we don't
-        // re-encode stuff twice :>
-        m_final_frame = std::move(intermediate_frame);
-#else
-        m_final_frame->SetFormat(PREFERRED_GPU_FORMAT);
+        m_final_frame->SetFormat(PreferredGpuFormat);
        if (const int ret = av_hwframe_transfer_data(m_final_frame->GetFrame(), intermediate_frame->GetFrame(), 0); ret < 0) {
            LOG_ERROR(HW_GPU, "av_hwframe_transfer_data error: {}", AVError(ret));
            return {};
        }
-#endif
    } else {
        m_final_frame = std::move(intermediate_frame);
    }
@@ -369,18 +281,9 @@ void DecodeApi::Reset() {
    m_hardware_context.reset();
    m_decoder_context.reset();
    m_decoder.reset();
-    m_opened = false;
-    m_defer_android_mediacodec_open = false;
-    m_needs_h264_extradata = false;
-    m_next_pts = 0;
-    while (!m_pending_offsets.empty()) {
-        m_pending_offsets.pop();
-    }
 }

 bool DecodeApi::Initialize(Tegra::Host1x::NvdecCommon::VideoCodec codec) {
-    av_log_set_level(AV_LOG_DEBUG);
-
    this->Reset();
    m_decoder.emplace(codec);
    m_decoder_context.emplace(*m_decoder);
@@ -391,80 +294,23 @@ bool DecodeApi::Initialize(Tegra::Host1x::NvdecCommon::VideoCodec codec) {
        m_hardware_context->InitializeForDecoder(*m_decoder_context, *m_decoder);
    }

-#ifdef __ANDROID__
-    const std::string_view decoder_name = m_decoder->GetCodec() ? m_decoder->GetCodec()->name : "";
-
-    // MediaCodec decoders need the frame dimensions before avcodec_open2().
-    m_defer_android_mediacodec_open = decoder_name == "h264_mediacodec" ||
-                                      decoder_name == "vp8_mediacodec" ||
-                                      decoder_name == "vp9_mediacodec";
-
-    // h264_mediacodec also needs SPS/PPS in extradata at open. We pull them
-    // from the first frame's bitstream in SendPacket.
-    m_needs_h264_extradata = decoder_name == "h264_mediacodec";
-    if (m_defer_android_mediacodec_open) {
-        return true;
-    }
-#endif
-
+    // Open the decoder context.
    if (!m_decoder_context->OpenContext(*m_decoder)) {
        this->Reset();
        return false;
    }
-    m_opened = true;

    return true;
 }

-bool DecodeApi::SendPacket(std::span<const u8> packet_data, const FrameOffsets& offsets,
-                           std::optional<FrameDimensions> dimensions) {
-    if (!m_opened) {
-        std::vector<u8> extradata;
-#ifdef __ANDROID__
-        if (m_defer_android_mediacodec_open) {
-            if (!dimensions) {
-                return true;
-            }
-
-            auto* ctx = m_decoder_context->GetCodecContext();
-            ctx->width = dimensions->width;
-            ctx->height = dimensions->height;
-            ctx->coded_width = dimensions->width;
-            ctx->coded_height = dimensions->height;
-        }
-
-        if (m_needs_h264_extradata) {
-            extradata = ExtractH264ParameterSetExtradata(packet_data);
-            if (extradata.empty()) {
-                return true;
-            }
-        }
-#endif
-        if (!m_decoder_context->OpenContext(*m_decoder, extradata)) {
-            this->Reset();
-            return false;
-        }
-        m_opened = true;
-    }
-    m_pending_offsets.push(offsets);
+bool DecodeApi::SendPacket(std::span<const u8> packet_data) {
    FFmpeg::Packet packet(packet_data);
-    packet.GetPacket()->pts = m_next_pts;
-    packet.GetPacket()->dts = m_next_pts;
-    ++m_next_pts;
    return m_decoder_context->SendPacket(packet);
 }

-std::optional<DecodeApi::DecodedFrame> DecodeApi::ReceiveFrame() {
-    auto frame = m_decoder_context->ReceiveFrame();
-    if (!frame) {
-        return std::nullopt;
-    }
-    FrameOffsets offsets{};
-    if (!m_pending_offsets.empty()) {
-        offsets = m_pending_offsets.front();
-        m_pending_offsets.pop();
-    }
-    return DecodedFrame{std::move(frame), offsets};
+std::shared_ptr<Frame> DecodeApi::ReceiveFrame() {
+    // Receive raw frame from decoder.
+    return m_decoder_context->ReceiveFrame();
 }

 }
@@ -179,7 +179,7 @@ public:
    ~DecoderContext();

    void InitializeHardwareDecoder(const HardwareContext& context, AVPixelFormat hw_pix_fmt);
-    bool OpenContext(const Decoder& decoder, std::span<const u8> extradata = {});
+    bool OpenContext(const Decoder& decoder);
    bool SendPacket(const Packet& packet);
    std::shared_ptr<Frame> ReceiveFrame();

@@ -198,18 +198,6 @@ private:
    bool m_decode_order{};
 };

-struct FrameOffsets {
-    bool interlaced{};
-    bool hidden{};
-    u64 luma{};
-    u64 luma_bottom{};
-};
-
-struct FrameDimensions {
-    s32 width{};
-    s32 height{};
-};
-
 class DecodeApi {
 public:
    YUZU_NON_COPYABLE(DecodeApi);
@@ -225,24 +213,13 @@ public:
        return m_decoder_context->UsingDecodeOrder();
    }

-    bool SendPacket(std::span<const u8> packet_data, const FrameOffsets& offsets,
-                    std::optional<FrameDimensions> dimensions = std::nullopt);
-
-    struct DecodedFrame {
-        std::shared_ptr<Frame> frame;
-        FrameOffsets offsets;
-    };
-    std::optional<DecodedFrame> ReceiveFrame();
+    bool SendPacket(std::span<const u8> packet_data);
+    std::shared_ptr<Frame> ReceiveFrame();

 private:
    std::optional<FFmpeg::Decoder> m_decoder;
    std::optional<FFmpeg::DecoderContext> m_decoder_context;
    std::optional<FFmpeg::HardwareContext> m_hardware_context;
-    bool m_opened{};
-    bool m_defer_android_mediacodec_open{};
-    bool m_needs_h264_extradata{};
-    s64 m_next_pts{};
-    std::queue<FrameOffsets> m_pending_offsets;
 };

 } // namespace FFmpeg
@@ -31,7 +31,6 @@ Nvdec::Nvdec(Host1x& host1x_, s32 id_, u32 syncpt)

 Nvdec::~Nvdec() {
    LOG_INFO(HW_GPU, "Destroying nvdec {}", id);
-    host1x.frame_queue.Close(id);
 }

 void Nvdec::ProcessMethod(u32 method, u32 argument) {
@@ -118,7 +118,6 @@ void Vic::Execute() noexcept {
    output_surface.resize(output_width * output_height);

    if (Settings::values.nvdec_emulation.GetValue() != Settings::NvdecEmulation::Off) {
-        bool decoded_frame = false;
        for (size_t i = 0; i < config.slot_structs.size(); i++) {
            if (auto& slot_config = config.slot_structs[i]; slot_config.config.slot_enable) {
                auto const luma_offset = regs.surfaces[i][SurfaceIndex::Current].luma.Address();
@@ -137,17 +136,11 @@ void Vic::Execute() noexcept {
                        break;
                    }
                    Blend(config, slot_config, config.output_surface_config.out_pixel_format);
-                    decoded_frame = true;
                } else {
-                    LOG_TRACE(HW_GPU, "Vic {} failed to get frame with offset {:#X}", id, luma_offset);
+                    LOG_ERROR(HW_GPU, "Vic {} failed to get frame with offset {:#X}", id, luma_offset);
                }
            }
        }
-        if (decoded_frame) {
-            has_decoded_frame = true;
-        } else if (!has_decoded_frame) {
-            return;
-        }
    } else {
        // Fill the frame with black, as otherwise they can have random data and be very glitchy.
        std::fill(output_surface.begin(), output_surface.end(), Pixel{});
@@ -628,7 +628,6 @@ private:

    s32 id;
    s32 nvdec_id{-1};
-    bool has_decoded_frame{};
    u32 syncpoint;
 };

@@ -169,6 +169,7 @@ try
 }

 RendererVulkan::~RendererVulkan() {
+    scheduler.WaitWorker();
    scheduler.RegisterOnSubmit([] {});
    void(device.GetLogical().WaitIdle());
 }
@@ -25,6 +25,9 @@
 #include "video_core/host_shaders/vulkan_quad_indexed_comp_spv.h"
 #include "video_core/host_shaders/vulkan_uint8_comp_spv.h"
 #include "video_core/host_shaders/block_linear_unswizzle_3d_bcn_comp_spv.h"
+#include "video_core/host_shaders/block_linear_unswizzle_2d_comp_spv.h"
+#include "video_core/host_shaders/block_linear_unswizzle_3d_comp_spv.h"
+#include "video_core/host_shaders/pitch_unswizzle_comp_spv.h"
 #include "video_core/renderer_vulkan/vk_compute_pass.h"
 #include "video_core/renderer_vulkan/vk_descriptor_pool.h"
 #include "video_core/renderer_vulkan/vk_scheduler.h"
@@ -232,6 +235,26 @@ struct QueriesPrefixScanPushConstants {
 struct ConditionalRenderingResolvePushConstants {
    u32 compare_to_zero;
 };
+
+struct BlockLinear3DImagePushConstants {
+    alignas(16) std::array<u32, 3> origin;
+    alignas(16) std::array<s32, 3> destination;
+    u32 bytes_per_block_log2;
+    u32 slice_size;
+    u32 block_size;
+    u32 x_shift;
+    u32 block_height;
+    u32 block_height_mask;
+    u32 block_depth;
+    u32 block_depth_mask;
+};
+
+struct PitchUnswizzlePushConstants {
+    std::array<u32, 2> origin;
+    std::array<s32, 2> destination;
+    u32 bytes_per_block;
+    u32 pitch;
+};
 } // Anonymous namespace

 ComputePass::ComputePass(const Device& device_, Scheduler& scheduler, DescriptorPool& descriptor_pool,
@@ -653,6 +676,309 @@ void ASTCDecoderPass::Assemble(Image& image, const StagingBufferRef& map,
    scheduler.Finish();
 }

+BlockLinearUnswizzleImage2DPass::BlockLinearUnswizzleImage2DPass(
+    const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_,
+    StagingBufferPool& staging_buffer_pool_,
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue_)
+    : ComputePass(device_, scheduler_, descriptor_pool_, ASTC_DESCRIPTOR_SET_BINDINGS,
+                  ASTC_PASS_DESCRIPTOR_UPDATE_TEMPLATE_ENTRY, ASTC_BANK_INFO,
+                  COMPUTE_PUSH_CONSTANT_RANGE<sizeof(BlockLinearSwizzle2DParams)>,
+                  BLOCK_LINEAR_UNSWIZZLE_2D_COMP_SPV),
+      scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_},
+      compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {}
+
+BlockLinearUnswizzleImage2DPass::~BlockLinearUnswizzleImage2DPass() = default;
+
+void BlockLinearUnswizzleImage2DPass::Unswizzle(
+    Image& image, const StagingBufferRef& map,
+    std::span<const VideoCommon::SwizzleParameters> swizzles) {
+    using namespace VideoCommon::Accelerated;
+    scheduler.RequestOutsideRenderPassOperationContext();
+    const VkPipeline vk_pipeline = *pipeline;
+    const VkImageAspectFlags aspect_mask = image.AspectMask();
+    const VkImage vk_image = image.Handle();
+    const bool is_initialized = image.ExchangeInitialization();
+    scheduler.Record([vk_pipeline, vk_image, aspect_mask,
+                      is_initialized](vk::CommandBuffer cmdbuf) {
+        const VkImageMemoryBarrier image_barrier{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = static_cast<VkAccessFlags>(is_initialized ? VK_ACCESS_SHADER_WRITE_BIT
+                                                                       : VK_ACCESS_NONE),
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT,
+            .oldLayout = is_initialized ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_UNDEFINED,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = vk_image,
+            .subresourceRange{
+                .aspectMask = aspect_mask,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(is_initialized ? vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER
+                              : VkPipelineStageFlags(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT),
+                       VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, image_barrier);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, vk_pipeline);
+    });
+    for (const VideoCommon::SwizzleParameters& swizzle : swizzles) {
+        const size_t input_offset = swizzle.buffer_offset + map.offset;
+        const u32 num_dispatches_x = Common::DivCeil(swizzle.num_tiles.width, 32U);
+        const u32 num_dispatches_y = Common::DivCeil(swizzle.num_tiles.height, 32U);
+        const u32 num_dispatches_z = image.info.resources.layers;
+
+        compute_pass_descriptor_queue.Acquire(scheduler, 2);
+        compute_pass_descriptor_queue.AddBuffer(map.buffer, input_offset,
+                                                image.guest_size_bytes - swizzle.buffer_offset);
+        compute_pass_descriptor_queue.AddImage(image.StorageImageView(swizzle.level));
+        const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()};
+
+        const auto params = MakeBlockLinearSwizzle2DParams(swizzle, image.info);
+        scheduler.Record([this, num_dispatches_x, num_dispatches_y, num_dispatches_z, params,
+                          descriptor_data](vk::CommandBuffer cmdbuf) {
+            const VkDescriptorSet set = descriptor_allocator.Commit();
+            device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);
+            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
+            cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, params);
+            cmdbuf.Dispatch(num_dispatches_x, num_dispatches_y, num_dispatches_z);
+        });
+    }
+    scheduler.Record([vk_image, aspect_mask](vk::CommandBuffer cmdbuf) {
+        const VkImageMemoryBarrier image_barrier{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |
+                             VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,
+            .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = vk_image,
+            .subresourceRange{
+                .aspectMask = aspect_mask,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+                       vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER, 0, image_barrier);
+    });
+    scheduler.Finish();
+}
+
+BlockLinearUnswizzleImage3DPass::BlockLinearUnswizzleImage3DPass(
+    const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_,
+    StagingBufferPool& staging_buffer_pool_,
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue_)
+    : ComputePass(device_, scheduler_, descriptor_pool_, ASTC_DESCRIPTOR_SET_BINDINGS,
+                  ASTC_PASS_DESCRIPTOR_UPDATE_TEMPLATE_ENTRY, ASTC_BANK_INFO,
+                  COMPUTE_PUSH_CONSTANT_RANGE<sizeof(BlockLinear3DImagePushConstants)>,
+                  BLOCK_LINEAR_UNSWIZZLE_3D_COMP_SPV),
+      scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_},
+      compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {}
+
+BlockLinearUnswizzleImage3DPass::~BlockLinearUnswizzleImage3DPass() = default;
+
+void BlockLinearUnswizzleImage3DPass::Unswizzle(
+    Image& image, const StagingBufferRef& map,
+    std::span<const VideoCommon::SwizzleParameters> swizzles) {
+    using namespace VideoCommon::Accelerated;
+    scheduler.RequestOutsideRenderPassOperationContext();
+    const VkPipeline vk_pipeline = *pipeline;
+    const VkImageAspectFlags aspect_mask = image.AspectMask();
+    const VkImage vk_image = image.Handle();
+    const bool is_initialized = image.ExchangeInitialization();
+    scheduler.Record([vk_pipeline, vk_image, aspect_mask,
+                      is_initialized](vk::CommandBuffer cmdbuf) {
+        const VkImageMemoryBarrier image_barrier{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = static_cast<VkAccessFlags>(is_initialized ? VK_ACCESS_SHADER_WRITE_BIT
+                                                                       : VK_ACCESS_NONE),
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT,
+            .oldLayout = is_initialized ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_UNDEFINED,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = vk_image,
+            .subresourceRange{
+                .aspectMask = aspect_mask,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(is_initialized ? vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER
+                              : VkPipelineStageFlags(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT),
+                       VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, image_barrier);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, vk_pipeline);
+    });
+    for (const VideoCommon::SwizzleParameters& swizzle : swizzles) {
+        const size_t input_offset = swizzle.buffer_offset + map.offset;
+        const u32 num_dispatches_x = Common::DivCeil(swizzle.num_tiles.width, 16U);
+        const u32 num_dispatches_y = Common::DivCeil(swizzle.num_tiles.height, 8U);
+        const u32 num_dispatches_z = Common::DivCeil(swizzle.num_tiles.depth, 8U);
+
+        compute_pass_descriptor_queue.Acquire(scheduler, 2);
+        compute_pass_descriptor_queue.AddBuffer(map.buffer, input_offset,
+                                                image.guest_size_bytes - swizzle.buffer_offset);
+        compute_pass_descriptor_queue.AddImage(image.StorageImageView(swizzle.level));
+        const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()};
+
+        const auto p = MakeBlockLinearSwizzle3DParams(swizzle, image.info);
+        const BlockLinear3DImagePushConstants params{
+            .origin = p.origin,
+            .destination = p.destination,
+            .bytes_per_block_log2 = p.bytes_per_block_log2,
+            .slice_size = p.slice_size,
+            .block_size = p.block_size,
+            .x_shift = p.x_shift,
+            .block_height = p.block_height,
+            .block_height_mask = p.block_height_mask,
+            .block_depth = p.block_depth,
+            .block_depth_mask = p.block_depth_mask,
+        };
+        scheduler.Record([this, num_dispatches_x, num_dispatches_y, num_dispatches_z, params,
+                          descriptor_data](vk::CommandBuffer cmdbuf) {
+            const VkDescriptorSet set = descriptor_allocator.Commit();
+            device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);
+            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
+            cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, params);
+            cmdbuf.Dispatch(num_dispatches_x, num_dispatches_y, num_dispatches_z);
+        });
+    }
+    scheduler.Record([vk_image, aspect_mask](vk::CommandBuffer cmdbuf) {
+        const VkImageMemoryBarrier image_barrier{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |
+                             VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,
+            .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = vk_image,
+            .subresourceRange{
+                .aspectMask = aspect_mask,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+                       vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER, 0, image_barrier);
+    });
+    scheduler.Finish();
+}
+
+PitchUnswizzlePass::PitchUnswizzlePass(const Device& device_, Scheduler& scheduler_,
+                                       DescriptorPool& descriptor_pool_,
+                                       StagingBufferPool& staging_buffer_pool_,
+                                       ComputePassDescriptorQueue& compute_pass_descriptor_queue_)
+    : ComputePass(device_, scheduler_, descriptor_pool_, ASTC_DESCRIPTOR_SET_BINDINGS,
+                  ASTC_PASS_DESCRIPTOR_UPDATE_TEMPLATE_ENTRY, ASTC_BANK_INFO,
+                  COMPUTE_PUSH_CONSTANT_RANGE<sizeof(PitchUnswizzlePushConstants)>,
+                  PITCH_UNSWIZZLE_COMP_SPV),
+      scheduler{scheduler_}, staging_buffer_pool{staging_buffer_pool_},
+      compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {}
+
+PitchUnswizzlePass::~PitchUnswizzlePass() = default;
+
+void PitchUnswizzlePass::Unswizzle(Image& image, const StagingBufferRef& map,
+                                   std::span<const VideoCommon::SwizzleParameters> swizzles) {
+    scheduler.RequestOutsideRenderPassOperationContext();
+    const VkPipeline vk_pipeline = *pipeline;
+    const VkImageAspectFlags aspect_mask = image.AspectMask();
+    const VkImage vk_image = image.Handle();
+    const bool is_initialized = image.ExchangeInitialization();
+    scheduler.Record([vk_pipeline, vk_image, aspect_mask,
+                      is_initialized](vk::CommandBuffer cmdbuf) {
+        const VkImageMemoryBarrier image_barrier{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = static_cast<VkAccessFlags>(is_initialized ? VK_ACCESS_SHADER_WRITE_BIT
+                                                                       : VK_ACCESS_NONE),
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT,
+            .oldLayout = is_initialized ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_UNDEFINED,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = vk_image,
+            .subresourceRange{
+                .aspectMask = aspect_mask,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(is_initialized ? vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER
+                              : VkPipelineStageFlags(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT),
+                       VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, image_barrier);
+        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, vk_pipeline);
+    });
+    const u32 bytes_per_block = VideoCore::Surface::BytesPerBlock(image.info.format);
+    for (const VideoCommon::SwizzleParameters& swizzle : swizzles) {
+        const size_t input_offset = swizzle.buffer_offset + map.offset;
+        const u32 num_dispatches_x = Common::DivCeil(swizzle.num_tiles.width, 32U);
+        const u32 num_dispatches_y = Common::DivCeil(swizzle.num_tiles.height, 32U);
+
+        compute_pass_descriptor_queue.Acquire(scheduler, 2);
+        compute_pass_descriptor_queue.AddBuffer(map.buffer, input_offset,
+                                                image.guest_size_bytes - swizzle.buffer_offset);
+        compute_pass_descriptor_queue.AddImage(image.StorageImageView(swizzle.level));
+        const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()};
+
+        const PitchUnswizzlePushConstants params{
+            .origin = {0, 0},
+            .destination = {0, 0},
+            .bytes_per_block = bytes_per_block,
+            .pitch = image.info.pitch,
+        };
+        scheduler.Record([this, num_dispatches_x, num_dispatches_y, params,
+                          descriptor_data](vk::CommandBuffer cmdbuf) {
+            const VkDescriptorSet set = descriptor_allocator.Commit();
+            device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);
+            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
+            cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, params);
+            cmdbuf.Dispatch(num_dispatches_x, num_dispatches_y, 1);
+        });
+    }
+    scheduler.Record([vk_image, aspect_mask](vk::CommandBuffer cmdbuf) {
+        const VkImageMemoryBarrier image_barrier{
+            .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
+            .pNext = nullptr,
+            .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
+            .dstAccessMask = VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_SHADER_WRITE_BIT |
+                             VK_ACCESS_TRANSFER_READ_BIT | VK_ACCESS_TRANSFER_WRITE_BIT,
+            .oldLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .newLayout = VK_IMAGE_LAYOUT_GENERAL,
+            .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+            .image = vk_image,
+            .subresourceRange{
+                .aspectMask = aspect_mask,
+                .baseMipLevel = 0,
+                .levelCount = VK_REMAINING_MIP_LEVELS,
+                .baseArrayLayer = 0,
+                .layerCount = VK_REMAINING_ARRAY_LAYERS,
+            },
+        };
+        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
+                       vk::PIPELINE_STAGE_GRAPHICS_COMPUTE_TRANSFER, 0, image_barrier);
+    });
+    scheduler.Finish();
+}
+
 constexpr u32 BL3D_BINDING_INPUT_BUFFER  = 0;
 constexpr u32 BL3D_BINDING_OUTPUT_BUFFER = 1;

@@ -833,6 +1159,23 @@ void BlockLinearUnswizzle3DPass::UnswizzleChunk(
            return;
        }

+        if (!is_first_chunk) {
+            const VkBufferMemoryBarrier reuse_barrier{
+                .sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER,
+                .pNext = nullptr,
+                .srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT,
+                .dstAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
+                .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
+                .buffer = out_buffer,
+                .offset = 0,
+                .size = VK_WHOLE_SIZE,
+            };
+            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,
+                                   VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, nullptr,
+                                   reuse_barrier, nullptr);
+        }
+
        device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);
        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);
        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
@@ -25,6 +25,7 @@ struct SwizzleParameters;

 namespace Vulkan {

+using VideoCommon::Accelerated::BlockLinearSwizzle2DParams;
 using VideoCommon::Accelerated::BlockLinearSwizzle3DParams;

 class Device;
@@ -164,6 +165,56 @@ private:
    ComputePassDescriptorQueue& compute_pass_descriptor_queue;
 };

+class BlockLinearUnswizzleImage2DPass final : public ComputePass {
+public:
+    explicit BlockLinearUnswizzleImage2DPass(const Device& device_, Scheduler& scheduler_,
+                                             DescriptorPool& descriptor_pool_,
+                                             StagingBufferPool& staging_buffer_pool_,
+                                             ComputePassDescriptorQueue& compute_pass_descriptor_queue_);
+    ~BlockLinearUnswizzleImage2DPass();
+
+    void Unswizzle(Image& image, const StagingBufferRef& map,
+                   std::span<const VideoCommon::SwizzleParameters> swizzles);
+
+private:
+    Scheduler& scheduler;
+    StagingBufferPool& staging_buffer_pool;
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue;
+};
+
+class BlockLinearUnswizzleImage3DPass final : public ComputePass {
+public:
+    explicit BlockLinearUnswizzleImage3DPass(const Device& device_, Scheduler& scheduler_,
+                                             DescriptorPool& descriptor_pool_,
+                                             StagingBufferPool& staging_buffer_pool_,
+                                             ComputePassDescriptorQueue& compute_pass_descriptor_queue_);
+    ~BlockLinearUnswizzleImage3DPass();
+
+    void Unswizzle(Image& image, const StagingBufferRef& map,
+                   std::span<const VideoCommon::SwizzleParameters> swizzles);
+
+private:
+    Scheduler& scheduler;
+    StagingBufferPool& staging_buffer_pool;
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue;
+};
+
+class PitchUnswizzlePass final : public ComputePass {
+public:
+    explicit PitchUnswizzlePass(const Device& device_, Scheduler& scheduler_,
+                                DescriptorPool& descriptor_pool_,
+                                StagingBufferPool& staging_buffer_pool_,
+                                ComputePassDescriptorQueue& compute_pass_descriptor_queue_);
+    ~PitchUnswizzlePass();
+
+    void Unswizzle(Image& image, const StagingBufferRef& map,
+                   std::span<const VideoCommon::SwizzleParameters> swizzles);
+
+private:
+    Scheduler& scheduler;
+    StagingBufferPool& staging_buffer_pool;
+    ComputePassDescriptorQueue& compute_pass_descriptor_queue;
+};

 class MSAACopyPass final : public ComputePass {
 public:
@@ -37,6 +37,8 @@

 namespace Vulkan {
 namespace {
+using boost::container::small_vector;
+using boost::container::static_vector;
 using Shader::ImageBufferDescriptor;
 using Shader::Backend::SPIRV::RENDERAREA_LAYOUT_OFFSET;
 using Shader::Backend::SPIRV::RESCALING_LAYOUT_DOWN_FACTOR_OFFSET;
@@ -583,9 +585,9 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
    } else {
        dynamic.raw1 = key.state.dynamic_state.raw1;
    }
-    boost::container::static_vector<VkVertexInputBindingDescription, 32> vertex_bindings;
-    boost::container::static_vector<VkVertexInputBindingDivisorDescriptionEXT, 32> vertex_binding_divisors;
-    boost::container::static_vector<VkVertexInputAttributeDescription, 32> vertex_attributes;
+    static_vector<VkVertexInputBindingDescription, 32> vertex_bindings;
+    static_vector<VkVertexInputBindingDivisorDescriptionEXT, 32> vertex_binding_divisors;
+    static_vector<VkVertexInputAttributeDescription, 32> vertex_attributes;
    if (!key.state.dynamic_vertex_input) {
        const size_t num_vertex_arrays = (std::min)(
            Maxwell::NumVertexArrays, static_cast<size_t>(device.GetMaxVertexInputBindings()));
@@ -810,7 +812,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
    if (dynamic.depth_bounds_enable && !device.IsDepthBoundsSupported()) {
        LOG_WARNING(Render_Vulkan, "Depth bounds is enabled but not supported");
    }
-    boost::container::static_vector<VkPipelineColorBlendAttachmentState, Maxwell::NumRenderTargets> cb_attachments;
+    static_vector<VkPipelineColorBlendAttachmentState, Maxwell::NumRenderTargets> cb_attachments;
    const size_t num_attachments{NumAttachments(key.state)};
    for (size_t index = 0; index < num_attachments; ++index) {
        static constexpr std::array mask_table{
@@ -846,7 +848,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
        .pAttachments = cb_attachments.data(),
        .blendConstants = {}
    };
-    boost::container::static_vector<VkDynamicState, 34> dynamic_states{
+    static_vector<VkDynamicState, 34> dynamic_states{
        VK_DYNAMIC_STATE_VIEWPORT,           VK_DYNAMIC_STATE_SCISSOR,
        VK_DYNAMIC_STATE_DEPTH_BIAS,         VK_DYNAMIC_STATE_BLEND_CONSTANTS,
        VK_DYNAMIC_STATE_DEPTH_BOUNDS,       VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK,
@@ -941,9 +943,12 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
        .pNext = nullptr,
        .requiredSubgroupSize = GuestWarpSize,
    };
-    boost::container::static_vector<VkPipelineShaderStageCreateInfo, 5> shader_stages;
+    static_vector<VkPipelineShaderStageCreateInfo, 5> shader_stages;
    for (size_t stage = 0; stage < Maxwell::MaxShaderStage; ++stage) {
-        if (spv_modules[stage]) {
+        if (!spv_modules[stage]) {
+            continue;
+        }
+        [[maybe_unused]] auto& stage_ci =
            shader_stages.emplace_back(VkPipelineShaderStageCreateInfo{
                .sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
                .pNext = nullptr,
@@ -953,7 +958,6 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {
                .pName = "main",
                .pSpecializationInfo = nullptr,
            });
-        }
    }
    VkPipelineCreateFlags flags{};
    if (device.IsKhrPipelineExecutablePropertiesEnabled() && Settings::values.renderer_debug.GetValue()) {
@@ -195,8 +195,42 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
    return allocator.CreateImage(image_ci);
 }

+[[nodiscard]] VkFormat UnswizzleStorageFormat(u32 bytes_per_block) {
+    switch (bytes_per_block) {
+    case 1:
+        return VK_FORMAT_R8_UINT;
+    case 2:
+        return VK_FORMAT_R16_UINT;
+    case 4:
+        return VK_FORMAT_R32_UINT;
+    case 8:
+        return VK_FORMAT_R32G32_UINT;
+    case 16:
+        return VK_FORMAT_R32G32B32A32_UINT;
+    default:
+        ASSERT_MSG(false, "Invalid bytes_per_block={} for accelerated unswizzle", bytes_per_block);
+        return VK_FORMAT_R32_UINT;
+    }
+}
+
+[[nodiscard]] bool IsUnswizzleStorageFormatSupported(const Device& device, u32 bytes_per_block) {
+    switch (bytes_per_block) {
+    case 1:
+        return device.IsStorageBuffer8BitAccessSupported();
+    case 2:
+        return device.IsStorageBuffer16BitAccessSupported();
+    case 4:
+    case 8:
+    case 16:
+        return true;
+    default:
+        return false;
+    }
+}
+
 [[nodiscard]] vk::ImageView MakeStorageView(const vk::Device& device, u32 level, VkImage image,
-                                            VkFormat format) {
+                                            VkFormat format,
+                                            VkImageViewType view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY) {
    static constexpr VkImageViewUsageCreateInfo storage_image_view_usage_create_info{
        .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO,
        .pNext = nullptr,
@@ -207,7 +241,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
        .pNext = &storage_image_view_usage_create_info,
        .flags = 0,
        .image = image,
-        .viewType = VK_IMAGE_VIEW_TYPE_2D_ARRAY,
+        .viewType = view_type,
        .format = format,
        .components{
            .r = VK_COMPONENT_SWIZZLE_IDENTITY,
@@ -887,6 +921,12 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, Scheduler& sched
    if (device.IsStorageImageMultisampleSupported()) {
        msaa_copy_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool, compute_pass_descriptor_queue);
    }
+    bl_unswizzle_2d_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,
+                                 compute_pass_descriptor_queue);
+    bl_unswizzle_3d_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,
+                                 compute_pass_descriptor_queue);
+    pitch_unswizzle_pass.emplace(device, scheduler, descriptor_pool, staging_buffer_pool,
+                                 compute_pass_descriptor_queue);
    if (!device.IsKhrImageFormatListSupported()) {
        return;
    }
@@ -894,6 +934,11 @@ TextureCacheRuntime::TextureCacheRuntime(const Device& device_, Scheduler& sched
        const auto image_format = static_cast<PixelFormat>(index_a);
        if (IsPixelFormatASTC(image_format) && !device.IsOptimalAstcSupported()) {
            view_formats[index_a].push_back(VK_FORMAT_A8B8G8R8_UNORM_PACK32);
+        } else if (!IsPixelFormatASTC(image_format) && !IsPixelFormatBCn(image_format)) {
+            const u32 bpp = VideoCore::Surface::BytesPerBlock(image_format);
+            if (IsUnswizzleStorageFormatSupported(device, bpp)) {
+                view_formats[index_a].push_back(UnswizzleStorageFormat(bpp));
+            }
        }
        for (size_t index_b = 0; index_b < VideoCore::Surface::MaxPixelFormat; index_b++) {
            const auto view_format = static_cast<PixelFormat>(index_b);
@@ -1580,6 +1625,16 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
        flags |= VideoCommon::ImageFlagBits::Converted;
        flags |= VideoCommon::ImageFlagBits::CostlyLoad;
    }
+    if (!IsPixelFormatASTC(info.format) && !IsPixelFormatBCn(info.format) &&
+        VideoCore::Surface::GetFormatType(info.format) ==
+            VideoCore::Surface::SurfaceType::ColorTexture &&
+        (info.type == ImageType::e2D || info.type == ImageType::e3D ||
+         info.type == ImageType::Linear)) {
+        if (IsUnswizzleStorageFormatSupported(runtime->device,
+                                              VideoCore::Surface::BytesPerBlock(info.format))) {
+            flags |= VideoCommon::ImageFlagBits::AcceleratedUpload;
+        }
+    }
    if (runtime->device.HasDebuggingToolAttached()) {
        original_image.SetObjectNameEXT(VideoCommon::Name(*this).c_str());
    }
@@ -1593,6 +1648,19 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
            storage_image_views[level] =
                MakeStorageView(device, level, *original_image, VK_FORMAT_A8B8G8R8_UNORM_PACK32);
        }
+    } else if (True(flags & VideoCommon::ImageFlagBits::AcceleratedUpload)) {
+        const auto& device = runtime->device.GetLogical();
+        const VkFormat storage_format =
+            UnswizzleStorageFormat(VideoCore::Surface::BytesPerBlock(info.format));
+        const VkImageViewType storage_view_type = info.type == ImageType::e3D
+                                                       ? VK_IMAGE_VIEW_TYPE_3D
+                                                   : info.type == ImageType::Linear
+                                                       ? VK_IMAGE_VIEW_TYPE_2D
+                                                       : VK_IMAGE_VIEW_TYPE_2D_ARRAY;
+        for (s32 level = 0; level < info.resources.levels; ++level) {
+            storage_image_views[level] =
+                MakeStorageView(device, level, *original_image, storage_format, storage_view_type);
+        }
    }
 }

@@ -2448,16 +2516,24 @@ void TextureCacheRuntime::AccelerateImageUpload(
        return astc_decoder_pass->Assemble(image, map, swizzles);
    }

-    if (!Settings::values.gpu_unswizzle_enabled.GetValue() || !bl3d_unswizzle_pass) {
-        if (IsPixelFormatBCn(image.info.format) && image.info.type == ImageType::e3D) {
-            ASSERT(false && "GPU unswizzle is disabled for BCn 3D texture");
+    if (IsPixelFormatBCn(image.info.format)) {
+        if (Settings::values.gpu_unswizzle_enabled.GetValue() && bl3d_unswizzle_pass &&
+            image.info.type == ImageType::e3D && image.info.resources.levels == 1 &&
+            image.info.resources.layers == 1) {
+            return bl3d_unswizzle_pass->Unswizzle(image, map, swizzles, z_start, z_count);
        }
-        ASSERT(false);
+        ASSERT(false && "GPU unswizzle is disabled for BCn 3D texture");
        return;
    }

-    if (bl3d_unswizzle_pass && IsPixelFormatBCn(image.info.format) && image.info.type == ImageType::e3D && image.info.resources.levels == 1 && image.info.resources.layers == 1) {
-        return bl3d_unswizzle_pass->Unswizzle(image, map, swizzles, z_start, z_count);
+    if (image.info.type == ImageType::e2D) {
+        return bl_unswizzle_2d_pass->Unswizzle(image, map, swizzles);
+    }
+    if (image.info.type == ImageType::e3D) {
+        return bl_unswizzle_3d_pass->Unswizzle(image, map, swizzles);
+    }
+    if (image.info.type == ImageType::Linear) {
+        return pitch_unswizzle_pass->Unswizzle(image, map, swizzles);
    }

    ASSERT(false);
@@ -130,6 +130,9 @@ public:
    std::optional<ASTCDecoderPass> astc_decoder_pass;

    std::optional<BlockLinearUnswizzle3DPass> bl3d_unswizzle_pass;
+    std::optional<BlockLinearUnswizzleImage2DPass> bl_unswizzle_2d_pass;
+    std::optional<BlockLinearUnswizzleImage3DPass> bl_unswizzle_3d_pass;
+    std::optional<PitchUnswizzlePass> pitch_unswizzle_pass;
    std::optional<MSAACopyPass> msaa_copy_pass;
    const Settings::ResolutionScalingInfo& resolution;
    std::array<std::vector<VkFormat>, VideoCore::Surface::MaxPixelFormat> view_formats;
@@ -888,6 +888,16 @@ FN_MAX_LIMIT_LIST
               features.bit16_storage.storageBuffer16BitAccess;
    }

+    /// Returns true if the device supports reading 8-bit values from a storage buffer.
+    bool IsStorageBuffer8BitAccessSupported() const {
+        return features.bit8_storage.storageBuffer8BitAccess;
+    }
+
+    /// Returns true if the device supports reading 16-bit values from a storage buffer.
+    bool IsStorageBuffer16BitAccessSupported() const {
+        return features.bit16_storage.storageBuffer16BitAccess;
+    }
+
    [[nodiscard]] static constexpr bool CheckBrokenCompute(VkDriverId driver_id,
                                                           u32 driver_version) {
        if (driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) {
@@ -1,3 +0,0 @@
-# CPMUtil CMake Test Scripts
-
-Testing out some CMake scripting functionality.
@@ -1,341 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-# TODO: Account for CPMConfig.cmake
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules)
-set(CPMUTIL_ROOT ${CMAKE_SOURCE_DIR})
-
-include(CPMUtil)
-
-# Parse the JSON object for a given key.
-macro(parse_key key)
-    get_json_object(${key})
-    set(JSON_NAME ${key})
-    parse_object(${object})
-endmacro()
-
-# Get a package's effective URL, for an already parsed object
-function(get_package_url_object out)
-    if (${url})
-        set(${out} "${url}")
-    else()
-        get_package_url(URL_OUT "${out}"
-            GIT_HOST "${git_host}"
-            REPO "${repo}"
-            VERSION "${version}"
-            ARTIFACT "${artifact}"
-            PACKAGE "${package}")
-    endif()
-
-    return(PROPAGATE ${out})
-endfunction()
-
-# Fetch a package from an already-parsed object.
-function(fetch_package_object)
-    set(optionArgs FORCE)
-    cmake_parse_arguments(ARG "${optionArgs}" "" "" ${ARGN})
-
-    if (${url})
-        set(pkg_url "${url}")
-    else()
-        get_package_url(URL_OUT pkg_url
-            GIT_HOST "${git_host}"
-            REPO "${repo}"
-            VERSION "${version}"
-            ARTIFACT "${artifact}"
-            PACKAGE "${package}")
-    endif()
-
-    if (DEFINED CACHE_PATH_OVERRIDE)
-        set(cache_path ${CACHE_PATH_OVERRIDE})
-    else()
-        get_cache_path(${package} ${version} cache_path)
-    endif()
-
-    set(fetch_args
-        URL "${pkg_url}"
-        HASH "${hash}"
-        PATH "${cache_path}"
-        PATCHES ${patches})
-
-    if(ARG_FORCE)
-        list(APPEND fetch_args FORCE)
-    endif()
-
-    fetch_package(${fetch_args})
-endfunction()
-
-# Format the cpmfile. Requires one of: jq, python, perl
-# If you don't have any of those, sorry not sorry.
-# Maybe I should make a shell-based alternative.
-function(format_cpmfile)
-    # jq is the preferred formatter since it's the fastest
-    cpm_find_program(JQ_EXECUTABLE jq)
-    if (JQ_EXECUTABLE)
-        set(command ${JQ_EXECUTABLE} --indent 4 -S .)
-    else()
-        # Python is simple and works
-        find_package(Python 3.5 COMPONENTS Interpreter QUIET)
-        if (Python_FOUND)
-            set(command ${Python_EXECUTABLE} -m json.tool
-                --indent 4 --sort-keys)
-        else()
-            # json_pp (part of perl) also works well
-            cpm_find_program(JSONPP_EXECUTABLE json_pp)
-            if (JSONPP_EXECUTABLE)
-                set(json_opts "indent" "indent_length=4" "canonical"
-                    "space_after=1" "space_before=0")
-                string(JOIN "," json_opts_str ${json_opts})
-
-                set(command ${JSONPP_EXECUTABLE} -f json -t json -json_opt
-                    "${json_opts_str}")
-            else()
-                fatal("Fatal: could not find one of jq, Python, or perl"
-                    "(json_pp). Install one of these packages to use"
-                    "CPMUtil's tooling. If they ARE installed, your"
-                    "CMake installation is broken.")
-            endif()
-        endif()
-    endif()
-
-    get_cpmfile_path(file)
-    mktempdir(TMP)
-    set(tmp_file ${TMP}/cpmfile.json)
-
-    execute_process(COMMAND ${command}
-        INPUT_FILE ${file}
-        OUTPUT_FILE ${tmp_file})
-
-    # TODO: error handling, mv, cp?
-    file(COPY_FILE ${tmp_file} ${file})
-
-    file(REMOVE_RECURSE ${TMP})
-endfunction()
-
-# Computes expected SHA512 hash of a package
-function(get_package_hash url out)
-    mktempdir(TMP)
-
-    get_filename_component(filename ${url} NAME)
-    set(file ${TMP}/${filename})
-
-    cpm_download("${url}" "${file}")
-    file(SHA512 ${file} ${out})
-
-    file(REMOVE_RECURSE ${TMP})
-    return(PROPAGATE ${out})
-endfunction()
-
-# Download and put the content into a variable.
-function(cpm_download_var url out)
-    mktempdir(TMP)
-
-    set(file ${TMP}/tmp)
-    cpm_download("${url}" "${file}")
-    file(READ ${file} ${out})
-
-    file(REMOVE_RECURSE ${TMP})
-    return(PROPAGATE ${out})
-endfunction()
-
-# Check if a URL request succeeds without actually saving anything
-function(cpm_url_exists url out)
-    foreach(i RANGE 5)
-        file(DOWNLOAD "${url}" STATUS ret LOG log TIMEOUT 10)
-        list(GET ret 0 code)
-
-        if (code EQUAL 0)
-            set(${out} TRUE)
-            break()
-        else()
-            if (log MATCHES "HTTP/[0-9.]+ (429|403)")
-                sleep(5)
-                continue()
-            endif()
-
-            set(${out} FALSE)
-            break()
-        endif()
-    endforeach()
-
-    return(PROPAGATE ${out})
-endfunction()
-
-# Get latest tag for a package.
-# Requires an already-parsed object
-function(get_latest_tag out)
-    # TODO: Ci packages
-    if (NOT repo OR ci)
-        set(${out} null)
-        return(PROPAGATE ${out})
-    endif()
-
-    # first determine if this is a tag or not
-    if (git_host STREQUAL github.com)
-        set(api "https://api.github.com/repos/${repo}")
-        set(check_endpoint "/git/refs/tags")
-    else()
-        set(api "https://${git_host}/api/v1/repos/${repo}")
-        set(check_endpoint "/tags")
-    endif()
-
-    # artifacts must only check releases
-    if ("${artifact}" STREQUAL "")
-        set(json_key name)
-        set(endpoint "/tags")
-    else()
-        set(json_key tag_name)
-        set(endpoint "/releases")
-        set(check_endpoint "/releases/tags")
-    endif()
-
-    cpm_url_exists("${api}${check_endpoint}/${version}" is_tag)
-
-    if (NOT is_tag)
-        set(${out} null)
-        return(PROPAGATE ${out})
-    endif()
-
-    # strip out prefixes e.g. boost-, openssl-, v
-    # NOTE: subrels e.g. -1 at the end may cause issues.
-    string(REGEX REPLACE "[^0-9.-]" "" t_numeric_version "${version}")
-    string(REGEX REPLACE "-$|^-" "" t_numeric_version "${numeric_version}")
-
-    # now api req
-    cpm_download_var("${api}${endpoint}" tags)
-
-    string(JSON len LENGTH ${tags})
-    math(EXPR last_index "${len} - 1")
-
-    set(greatest_version_numeric ${t_numeric_version})
-    set(greatest_version ${version})
-
-    foreach(i RANGE ${last_index})
-        string(JSON tag_obj GET "${tags}" ${i})
-        string(JSON tag_name GET "${tag_obj}" ${json_key})
-
-        # same as above
-        string(REGEX REPLACE "[^0-9.-]" "" numeric_tag "${tag_name}")
-        string(REGEX REPLACE "-$|^-" "" numeric_tag "${numeric_tag}")
-
-        if (numeric_tag VERSION_GREATER_EQUAL greatest_version_numeric)
-            set(greatest_version_numeric ${numeric_tag})
-            set(greatest_version ${tag_name})
-        endif()
-    endforeach()
-
-    # numeric version replacement
-    if (numeric_version)
-        set(${out} ${greatest_version_numeric})
-    else()
-        set(${out} ${greatest_version})
-    endif()
-
-    return(PROPAGATE ${out})
-endfunction()
-
-# TODO(crueter): Combine these
-
-# Update hash and version of a package
-# Outputs the updated object
-function(modify_package object version hash out)
-    string(JSON new_object SET "${object}" hash "\"${hash}\"")
-    string(JSON new_object SET "${new_object}" version "\"${version}\"")
-
-    set(${out} "${new_object}")
-    return(PROPAGATE ${out})
-endfunction()
-
-# Update hash and numeric_version of a package
-# Outputs the updated object
-function(modify_package_numeric object version hash out)
-    string(JSON new_object SET "${object}" hash "\"${hash}\"")
-    string(JSON new_object SET "${new_object}" numeric_version "\"${version}\"")
-
-    set(${out} "${new_object}")
-    return(PROPAGATE ${out})
-endfunction()
-
-
-function(get_cpmfile_keys out)
-    get_cpmfile_content(object)
-
-    string(JSON len LENGTH ${object})
-
-    math(EXPR last_index "${len} - 1")
-    foreach(i RANGE ${last_index})
-        string(JSON key MEMBER ${object} ${i})
-        list(APPEND ${out} ${key})
-    endforeach()
-
-    return(PROPAGATE ${out})
-endfunction()
-
-function(parse_script_args out)
-    if(PRINT_USAGE)
-        usage()
-        cmake_language(EXIT 0)
-    endif()
-
-    if(NOT CMAKE_SCRIPT_MODE_FILE OR NOT CMAKE_ARGC)
-        set(${out} "" PARENT_SCOPE)
-        return()
-    endif()
-
-    set(found_script FALSE)
-    set(idx 0)
-
-    get_filename_component(script_name "${CMAKE_SCRIPT_MODE_FILE}" NAME)
-
-    while(idx LESS CMAKE_ARGC)
-        if(found_script)
-            set(arg "${CMAKE_ARGV${idx}}")
-            if(NOT arg STREQUAL "--")
-                list(APPEND positional_args ${arg})
-            endif()
-        elseif(CMAKE_ARGV${idx} STREQUAL CMAKE_SCRIPT_MODE_FILE)
-            set(found_script TRUE)
-        else()
-            get_filename_component(arg_name "${CMAKE_ARGV${idx}}" NAME)
-            if(arg_name STREQUAL script_name)
-                set(found_script TRUE)
-            endif()
-        endif()
-        math(EXPR idx "${idx} + 1")
-    endwhile()
-
-    if(ALL_PACKAGES AND NOT NO_ALL)
-        get_cpmfile_keys(all_keys)
-        if(NO_CI)
-            set(filtered_keys)
-            foreach(key ${all_keys})
-                parse_key(${key})
-                if(NOT ci)
-                    list(APPEND filtered_keys ${key})
-                endif()
-            endforeach()
-            set(positional_args ${filtered_keys})
-        else()
-            set(positional_args ${all_keys})
-        endif()
-    endif()
-
-    set(${out} ${positional_args} PARENT_SCOPE)
-endfunction()
-
-# Convert a CMake list to a JSON array
-function(list_to_array list out)
-    set(${out} "[]")
-    set(idx 0)
-    foreach(elem ${list})
-        string(JSON ${out} SET ${${out}} "${idx}" "\"${elem}\"")
-        math(EXPR idx "${idx} + 1")
-    endforeach()
-
-    return(PROPAGATE ${out})
-endfunction()
@@ -1,24 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/ScriptUtils.cmake)
-
-set(NO_ALL TRUE)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh ls
-
-List all packages in the cpmfile.
-]=])
-endfunction()
-
-get_cpmfile_keys(keys)
-
-foreach(key ${keys})
-    echo("${key}")
-endforeach()
@@ -1,104 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: add.cmake [OPTIONS...]
-
-Internal use only.
-]=])
-endfunction()
-
-if (NOT DEFINED KEY)
-    fatal("KEY is required")
-endif()
-
-if (NOT DEFINED REPO)
-    fatal("REPO is required")
-endif()
-
-if (NOT DEFINED VERSION)
-    fatal("VERSION is required")
-endif()
-
-
-if (NOT DEFINED CI)
-    set(CI FALSE)
-endif()
-
-# construct json
-set(object "{}")
-
-macro(add key val)
-    set(${key} ${val})
-    string(JSON object SET ${object} ${key} "\"${val}\"")
-endmacro()
-
-add(repo ${REPO})
-add(version ${VERSION})
-
-if (DEFINED GIT_HOST AND NOT "${GIT_HOST}" STREQUAL github.com)
-    add(git_host ${GIT_HOST})
-else()
-    set(git_host github.com)
-endif()
-
-if (DEFINED PACKAGE)
-    add(package ${PACKAGE})
-else()
-    set(package ${KEY})
-endif()
-
-if (DEFINED FIND_ARGS)
-    add(find_args "${FIND_ARGS}")
-endif()
-
-if (DEFINED MIN_VERSION)
-    add(min_version ${MIN_VERSION})
-endif()
-
-if (DEFINED ARTIFACT)
-    add(artifact ${ARTIFACT})
-endif()
-
-if (CI)
-    add(ci true)
-
-    if (DEFINED DISABLED_PLATFORMS)
-        list_to_array(${DISABLED_PLATFORMS} json_disabled)
-        string(JSON object SET "${object}" disabled_platforms "${json_disabled}")
-    endif()
-else()
-    if (DEFINED OPTIONS)
-        list_to_array(${OPTIONS} json_options)
-        string(JSON object SET "${object}" options "${json_options}")
-    endif()
-
-    # get hash
-    get_package_url_object(pkg_url)
-    get_package_hash("${pkg_url}" pkg_hash)
-
-    add(hash ${pkg_hash})
-
-endif()
-
-echo("\"${KEY}\": ${object}")
-
-# now write
-get_cpmfile_content(cpmfile)
-
-# update cached cpmfile content
-string(JSON cpmfile SET "${cpmfile}" "${KEY}" "${object}")
-
-# write cached cpmfile
-get_cpmfile_path(file)
-file(WRITE ${file} "${cpmfile}")
-format_cpmfile()
-
-echo("-- Added ${KEY}")
@@ -1,33 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package dir [-a|--all] [PACKAGE]...
-
-Get the local directory for the specified packages.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-]=])
-endfunction()
-
-parse_script_args(args)
-
-# TODO: CI packages.
-
-foreach(key ${args})
-    parse_key(${key})
-
-    # Guh.
-    get_cache_path(${package} ${version} cache_path)
-
-    cmake_path(ABSOLUTE_PATH cache_path NORMALIZE OUTPUT_VARIABLE abs_path)
-    echo("${key}: ${abs_path}")
-endforeach()
@@ -1,34 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package fetch [-a|--all] [PACKAGE]...
-
-Fetch the specified package or packages from their defined download locations.
-If the package is already cached, it will not be re-fetched.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-]=])
-endfunction()
-
-set(NO_CI TRUE)
-parse_script_args(args)
-
-foreach(key ${args})
-    if (ci)
-        continue()
-    endif()
-
-    parse_key(${key})
-    echo("-- ${key}")
-
-    fetch_package_object()
-endforeach()
@@ -1,59 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package hash [-a|--all] [PACKAGE]...
-
-Check the hash of a specific package or packages.
-If a hash mismatch occurs, this script will update the package's hash.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-
-Note that this procedure will usually take a long time
-depending on the number and size of dependencies.
-]=])
-endfunction()
-
-set(NO_CI TRUE)
-parse_script_args(args)
-
-get_cpmfile_content(cpmfile)
-foreach(key ${args})
-    if (ci)
-        continue()
-    endif()
-
-    parse_key("${key}")
-    echo("-- ${key}")
-
-    get_package_url_object(pkg_url)
-    get_package_hash("${pkg_url}" pkg_hash)
-
-    if (pkg_hash STREQUAL hash)
-        echo("Hashes match")
-    else()
-        echo_error("Hash mismatch")
-        echo_error("Expected: ${hash}")
-        echo_error("Got:      ${pkg_hash}")
-
-        modify_package("${object}" "${version}" "${pkg_hash}" new_object)
-
-        # update cached cpmfile content
-        string(JSON cpmfile SET "${cpmfile}" "${key}" "${new_object}")
-
-        echo("Corrected hash for ${key}")
-    endif()
-endforeach()
-
-# write cached cpmfile
-get_cpmfile_path(file)
-file(WRITE ${file} "${cpmfile}")
-format_cpmfile()
@@ -1,155 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package patch [PACKAGE]
-
-Create an in-tree patch for the specified package.
-]=])
-endfunction()
-
-set(NO_ALL TRUE)
-
-# arg parsing
-parse_script_args(args)
-
-list(LENGTH args arg_len)
-if(arg_len GREATER 0)
-    list(GET args 0 KEY)
-endif()
-
-if (NOT KEY)
-    fatal("You must provide a key")
-endif()
-
-if (NOT DEFINED DESCRIPTION)
-    fatal("No description provided")
-endif()
-
-parse_key(${KEY})
-get_cache_path(${package} ${version} local_cache)
-
-if (NOT EXISTS ${local_cache})
-    fatal("${package} is not fetched locally")
-endif()
-
-# get last patch number + 1
-list(LENGTH patches patches_len)
-math(EXPR last_index "${patches_len} - 1")
-list(GET patches ${last_index} patch)
-string(REGEX MATCH "[0-9][0-9][0-9][0-9]" number "${patch}")
-math(EXPR new_patchnum "${number} + 1")
-
-# now pad it for filename usage
-set(padded "0000${new_patchnum}")
-string(LENGTH ${padded} total_len)
-math(EXPR start_index "${total_len} - 4")
-string(SUBSTRING ${padded} ${start_index} 4 padded_patch_number)
-
-# this requires Git
-find_package(Git REQUIRED)
-
-# fetch temporary package
-mktempdir(TMP)
-
-set(CACHE_PATH_OVERRIDE ${TMP}/local)
-fetch_package_object()
-
-# make patch dir
-set(patch_dir "${CPMUTIL_PATCH_DIR}/${KEY}")
-file(MAKE_DIRECTORY "${patch_dir}")
-
-# git stuff
-macro(git_cmd out out_status)
-    echo("${GIT_EXECUTABLE} ${ARGN}")
-    # TODO: error handling
-    execute_process(COMMAND ${GIT_EXECUTABLE} ${ARGN}
-        WORKING_DIRECTORY ${CACHE_PATH_OVERRIDE}
-        OUTPUT_VARIABLE ${out}
-        RESULT_VARIABLE ${out_status})
-endmacro()
-
-# initialize
-git_cmd(_ _ init)
-git_cmd(_ _ add -A)
-git_cmd(_ _ commit -m init)
-git_cmd(_ _ "--work-tree=${local_cache}" add -A)
-
-# check for diffs
-git_cmd(_ diff_status diff --cached --quiet)
-git_cmd(out _ diff)
-
-if (diff_status EQUAL 0)
-    echo(${out})
-    echo_error("No differences found between local copy and source")
-    file(REMOVE_RECURSE ${TMP})
-    cmake_language(EXIT 1)
-endif()
-
-# prompt for patch description
-git_cmd(_ commit_status commit -m "${DESCRIPTION}")
-
-# format patch
-git_cmd(patch_content _ format-patch -1 HEAD --stdout)
-
-# now get patch name...
-
-# strip out existing numeric prefix
-string(REGEX REPLACE "^[0-9][0-9][0-9][0-9]-" "" name_part "${DESCRIPTION}")
-# spaces to dashes
-string(REPLACE " " "-" name_part "${name_part}")
-# strip out non-alphanumeric or dash characters
-string(REGEX REPLACE "[^a-zA-Z0-9-]" "" name_part "${name_part}")
-# collapse consecutive dashes
-string(REGEX REPLACE "-+" "-" name_part "${name_part}")
-# strip leading/trailing dashes
-string(REGEX REPLACE "^-|-$" "" name_part "${name_part}")
-
-if (NOT name_part)
-    set(name_part "patch")
-    echo_error("Warning: could not determine patch name")
-endif()
-
-# Truncate to 49 chars (60 - num prefix - `.patch` suffix)
-string(SUBSTRING "${name_part}" 0 49 name_part)
-
-# And remove any trailing dashes
-string(REGEX REPLACE "-$" "" name_part "${name_part}")
-
-# now construct and save patch
-set(patch_name "${padded_patch_number}-${name_part}.patch")
-
-file(WRITE "${patch_dir}/${patch_name}" "${patch_content}")
-
-echo("-- Patch created at ${patch_dir}/${patch_name}")
-file(REMOVE_RECURSE ${TMP})
-
-# Now add to cpmfile.
-get_cpmfile_content(content)
-
-# Build new patches JSON array
-set(new_patches "[")
-if(patches)
-    string(JSON existing GET "${content}" "${KEY}" "patches")
-    string(JSON len LENGTH "${existing}")
-    math(EXPR range_end "${len} - 1")
-    foreach(idx RANGE ${range_end})
-        string(JSON val GET "${existing}" ${idx})
-        string(APPEND new_patches "\"${val}\",")
-    endforeach()
-endif()
-string(APPEND new_patches "\"${patch_name}\"]")
-
-# Update the cpmfile
-string(JSON content SET "${content}" "${KEY}" patches "${new_patches}")
-get_cpmfile_path(file_path)
-file(WRITE "${file_path}" "${content}")
-format_cpmfile()
-
@@ -1,34 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package reset [-a|--all] [PACKAGE]...
-
-Reset a locally fetched package to its original state.
-This is most useful for dropping any changes you've made.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-]=])
-endfunction()
-
-set(NO_CI TRUE)
-parse_script_args(args)
-
-foreach(key ${args})
-    if (ci)
-        continue()
-    endif()
-
-    parse_key(${key})
-    echo("-- ${key}")
-
-    fetch_package_object(FORCE)
-endforeach()
@@ -1,31 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package rm [PACKAGE]...
-
-Delete a package or packages' cpmfile definition.
-]=])
-endfunction()
-
-set(NO_ALL TRUE)
-parse_script_args(args)
-
-get_cpmfile_content(object)
-
-# Remove key
-foreach(key ${args})
-    string(JSON object REMOVE "${object}" ${key})
-endforeach()
-
-# write
-get_cpmfile_path(file)
-file(WRITE ${file} "${object}")
-format_cpmfile()
@@ -1,97 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package update [-a|--all] [-c|--commit] [PACKAGE]...
-
-Check for updates for a package or packages.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-    -c, --commit    Automatically generate a commit message
-]=])
-endfunction()
-
-set(NO_CI TRUE)
-
-parse_script_args(args)
-
-get_cpmfile_content(cpmfile)
-set(update_log "")
-set(changed FALSE)
-
-foreach(key ${args})
-    parse_key(${key})
-
-    get_latest_tag(tag)
-
-    if (${tag} STREQUAL null)
-        continue()
-    elseif(NOT ${tag} STREQUAL ${version})
-        if (numeric_version)
-            set(old_version ${numeric_version})
-            echo("${key}: ${old_version} -> ${tag}")
-            set(numeric_version ${tag})
-            get_json_element("${object}" version version)
-        else()
-            set(old_version ${version})
-            echo("${key}: ${old_version} -> ${tag}")
-            set(version ${tag})
-        endif()
-
-        get_json_element("${object}" artifact artifact)
-
-        # Redo version replacements
-        process_version_replacements()
-
-        get_package_url_object(pkg_url)
-        get_package_hash("${pkg_url}" pkg_hash)
-
-        if (numeric_version)
-            modify_package_numeric("${object}"
-                "${tag}" "${pkg_hash}" new_object)
-        else()
-            modify_package("${object}" "${tag}" "${pkg_hash}" new_object)
-        endif()
-
-        # update cached cpmfile content
-        string(JSON cpmfile SET "${cpmfile}" "${key}" "${new_object}")
-
-        # used for commit
-        string(APPEND update_log "* ${key}: ${old_version} -> ${tag}\n")
-        set(changed TRUE)
-    else()
-        echo("${key}: Up to date")
-    endif()
-endforeach()
-
-get_cpmfile_path(file)
-file(WRITE ${file} "${cpmfile}")
-format_cpmfile()
-
-if(MAKE_COMMIT AND changed)
-    mktempdir(TMP)
-
-    find_package(Git QUIET)
-
-    if (NOT Git_FOUND)
-        fatal("Git is required to be installed for --commit,"
-            "but it could not be found.")
-    endif()
-
-    set(msg_file ${TMP}/commit_msg.txt)
-    file(WRITE ${msg_file} "Update dependencies\n\n${update_log}")
-    execute_process(COMMAND ${GIT_EXECUTABLE} add cpmfile.json
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-    execute_process(COMMAND ${GIT_EXECUTABLE} commit -F ${msg_file}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-
-    file(REMOVE_RECURSE ${TMP})
-endif()
@@ -1,28 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package url [-a|--all] [PACKAGE]...
-
-Get the download URL for the specified packages.
-
-Options:
-    -a, --all       Operate on all packages in this project.
-]=])
-endfunction()
-
-parse_script_args(args)
-
-foreach(key ${args})
-    parse_key(${key})
-
-    get_package_url_object(pkg_url)
-    echo("${key}: ${pkg_url}")
-endforeach()
@@ -1,75 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package version [PACKAGE] [VERSION]
-
-Update a package's version. If the package uses a sha, you must provide a sha,
-and if the package uses a tag, you must provide the fully qualified tag.
-]=])
-endfunction()
-
-set(NO_ALL TRUE)
-# arg parsing
-parse_script_args(args)
-
-list(LENGTH args arg_len)
-if(arg_len GREATER 0)
-    list(GET args 0 KEY)
-endif()
-
-if(arg_len GREATER 1)
-    list(GET args 1 NEW_VERSION)
-endif()
-
-# checks
-if (NOT KEY)
-    fatal("You must provide a key")
-endif()
-
-if (NOT NEW_VERSION)
-    fatal("You must provide a version")
-endif()
-
-# action
-get_cpmfile_content(cpmfile)
-parse_key("${KEY}")
-
-if (numeric_version)
-    set(numeric_version ${NEW_VERSION})
-    get_json_element("${object}" version version)
-else()
-    set(version ${NEW_VERSION})
-endif()
-
-get_json_element("${object}" artifact artifact)
-
-# Redo version replacements
-process_version_replacements()
-
-get_package_url_object(pkg_url)
-get_package_hash("${pkg_url}" pkg_hash)
-
-if (numeric_version)
-    modify_package_numeric("${object}"
-        "${NEW_VERSION}" "${pkg_hash}" new_object)
-else()
-    modify_package("${object}" "${NEW_VERSION}" "${pkg_hash}" new_object)
-endif()
-
-# update cached cpmfile content
-string(JSON cpmfile SET "${cpmfile}" "${key}" "${new_object}")
-
-# write cached cpmfile
-get_cpmfile_path(file)
-file(WRITE ${file} "${cpmfile}")
-format_cpmfile()
-
-echo("-- * Updated")
@@ -1,36 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/../ScriptUtils.cmake)
-
-function(usage)
-    echo([=[
-Usage: cpmutil.sh package which [PACKAGE]...
-
-Check if a package or packages are defined in the cpmfile.
-]=])
-endfunction()
-
-set(NO_ALL TRUE)
-parse_script_args(args)
-set(exit 0)
-
-get_cpmfile_content(object)
-
-foreach(key ${args})
-    # Check if a key exists
-    string(JSON member ERROR_VARIABLE err GET "${object}" ${key})
-
-    if (NOT err)
-        echo("${key}")
-    else()
-        echo_error("${key} not defined in cpmfile")
-        set(exit 1)
-    endif()
-endforeach()
-
-cmake_language(EXIT ${exit})
@@ -1,33 +0,0 @@
-#!/usr/bin/env -S cmake -P
-
-# SPDX-FileCopyrightText: Copyright 2026 crueter
-# SPDX-License-Identifier: LGPL-3.0-or-later
-
-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/ScriptUtils.cmake)
-
-# Update CPMUtil and its tooling/etc
-set(pwd ${CMAKE_SOURCE_DIR})
-
-set(host "https://git.crueter.xyz")
-set(repo "CMake/CPMUtil")
-set(release "releases/download/continuous")
-set(filename CPMUtil.tar.zst)
-
-mktempdir(TMP)
-
-# Download tarball
-set(url "${host}/${repo}/${release}/${filename}")
-set(file ${TMP}/${filename})
-
-cpm_download(${url} ${file})
-
-# Extract to current working directory
-file(ARCHIVE_EXTRACT
-    INPUT ${file}
-    DESTINATION ${pwd})
-
-# done :)
-echo("Updated CPMUtil")
-file(REMOVE_RECURSE ${TMP})
@@ -0,0 +1,45 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+: "${CPM_SOURCE_CACHE:=$PWD/.cache/cpm}"
+: "${CPMUTIL_PATCH_DIR:=$PWD/.patch}"
+
+# TODO: cache cpmfile defs?
+
+cmd_exists() {
+	command -v "$1" >/dev/null 2>&1
+}
+
+must_install() {
+	for cmd in "$@"; do
+		cmd_exists "$cmd" || { echo "-- $cmd must be installed" && exit 1; }
+	done
+}
+
+# Random integer between 100000 and 999999
+_randint() {
+	awk 'BEGIN { srand(); print int(100000 + rand() * 900000) }'
+}
+
+# Use mktemp if available, use a local temp dir otherwise
+make_temp_dir() {
+	if cmd_exists mktemp; then
+		mktemp -d
+	else
+		TMP="$PWD/.cpm/tmp-$(_randint)"
+		mkdir -p "$TMP"
+		echo "$TMP"
+	fi
+}
+
+# must_install jq find mktemp tar 7z unzip sha512sum git patch curl
+
+if [ ! -s cpmfile.json ]; then
+	# TODO: actually make it a no-op
+	echo "-- Warning: cpmfile.json does not exist or is empty, most commands will be no-ops"
+else
+	LIBS=$(jq -j 'keys_unsorted | join(" ")' cpmfile.json)
+	export LIBS
+fi
@@ -1,11 +1,9 @@
-#!/usr/bin/env -S cmake -P
+#!/bin/sh -e

 # SPDX-FileCopyrightText: Copyright 2026 crueter
 # SPDX-License-Identifier: LGPL-3.0-or-later

-cmake_minimum_required(VERSION 3.31)
-
-include(${CMAKE_CURRENT_LIST_DIR}/ScriptUtils.cmake)
+jq --indent 4 -S <cpmfile.json >cpmfile.json.new
+mv cpmfile.json.new cpmfile.json

 # TODO: Run some sanity checks e.g. patches exist, etc.
-format_cpmfile()
@@ -6,22 +6,14 @@
 SUBMODULES="$(git submodule status --recursive | cut -c2-)"
 : "${SUBMODULES:?No submodules defined!}"

+tmp=$(mktemp)
+printf '{}' >"$tmp"
+
 IFS="
 "
 for i in $SUBMODULES; do
-	commit=$(echo "$i" -d" " -f1 | cut -c1-10)
-	short_commit=$(echo "$i" -d" " -f1 | cut -c1-7)
-
-	ref=$(echo "$i" | cut -d" " -f3 | tr -d '()')
-
-	case "$ref" in
-	# ref == commit, use commit versioning
-	"$short_commit") version="$commit" ;;
-	# ref is a branch, use commit versioning
-	heads/*) version="$commit" ;;
-	# ref is (probably) a tag, use tag versioning
-	*) version="$ref" ;;
-	esac
+	sha=$(echo "$i" | cut -d" " -f1 | cut -c1-10)
+	ver=$(echo "$i" | cut -d" " -f3 | tr -d '()')

 	path=$(echo "$i" | cut -d" " -f2)
 	name=$(echo "$path" | awk -F/ '{print $NF}')
@@ -29,9 +21,26 @@ for i in $SUBMODULES; do
 	remote=$(git -C "$path" remote get-url origin)

 	host=$(echo "$remote" | cut -d"/" -f3)
+	[ "$host" != github.com ] || host=

 	repo=$(echo "$remote" | cut -d"/" -f4-5 | cut -d'.' -f1)

-	cmake -DKEY="$name" -DVERSION="$version" -DREPO="$repo" -DGIT_HOST="$host" \
-		-P "$CMAKE/package/add.cmake"
+	entry=$(jq -n --arg name "$name" \
+		--arg sha "$sha" \
+		--arg ver "$ver" \
+		--arg repo "$repo" \
+		--arg host "$host" \
+		'{
+        ($name): {
+            sha: $sha,
+            version: $ver,
+            repo: $repo
+        } + (if $host != "" then {git_host: $host} else {} end)
+        }')
+
+	jq --argjson new "$entry" '. + $new' "$tmp" >"${tmp}.new"
+	mv "$tmp.new" "$tmp"
 done
+
+jq '.' "$tmp" >cpmfile.json
+rm -f "$tmp"
@@ -12,17 +12,17 @@ Usage: cpmutil.sh package [command]
 Operate on a package or packages.

 Commands:
-    hash            	Verify the hash of a package, and update it if needed
-    update          	Check for updates for a package
-    fetch           	Fetch a package and place it in the cache
-    add             	Add a new package
-    rm              	Remove a package
-    version         	Change the version of a package
-    which           	Check if a package is defined
-    url             	Get the download URL for a package
-    dir             	Get the local directory for a package
-    reset           	Reset a fetched package to its original state
-    patch           	Add a patch to a package in the cpmfile
+    hash    	Verify the hash of a package, and update it if needed
+    update  	Check for updates for a package
+    fetch   	Fetch a package and place it in the cache
+    add     	Add a new package
+    rm      	Remove a package
+    version 	Change the version of a package
+    which   	Check if a package is defined
+    download 	Get the download URL for a package
+    dir     	Get the local directory for a package
+    reset   	Reset a fetched package to its original state
+    patch   	Create an in-tree patch based on local modifications

 EOF

@@ -30,48 +30,11 @@ EOF
 }

 SCRIPTS=$(CDPATH='' cd -- "$(dirname -- "$0")/package" && pwd)
-CMAKE="$CMAKE/package"
-
-export SCRIPTS CMAKE
-
-filter_args() {
-	print_usage=false
-	all_flag=false
-	commit_flag=false
-	filtered=""
-
-	for arg in "$@"; do
-		case "$arg" in
-		-h | --help) print_usage=true ;;
-		-a | --all) all_flag=true ;;
-		-c | --commit) commit_flag=true ;;
-		-ac | -ca)
-			commit_flag=true
-			all_flag=true
-			;;
-		*) filtered="$filtered $arg" ;;
-		esac
-	done
-}
+export SCRIPTS

 while :; do
 	case "$1" in
-	dir | fetch | hash | reset | rm | url | version | which | update)
-		cmd="$1"
-		shift
-
-		filter_args "$@"
-		cmake_defines=""
-
-		if $print_usage; then cmake_defines="$cmake_defines -DPRINT_USAGE=TRUE"; fi
-		if $all_flag; then cmake_defines="$cmake_defines -DALL_PACKAGES=TRUE"; fi
-		if $commit_flag; then cmake_defines="$cmake_defines -DMAKE_COMMIT=TRUE"; fi
-
-		# shellcheck disable=SC2086
-		cmake $cmake_defines -P "$CMAKE/$cmd.cmake" -- $filtered
-		break
-		;;
-	add | patch)
+	hash | update | fetch | add | rm | version | which | download | reset | patch | dir)
 		cmd="$1"
 		shift
 		"$SCRIPTS/$cmd".sh "$@"
@@ -49,153 +49,6 @@ done

 [ -n "$PKG" ] || die "You must specify a package name."

-# This reads a single-line input from the user and also gives them
-# help if needed.
-# $1: The prompt itself, without any trailing spaces or whatever
-# $2: The help text that gets shown when the user types a question mark
-# $3: This is set to "required" if it's necessary,
-#     otherwise it can continue without input.
-# Stores its output in the "reply" variable
-read_single() {
-	while :; do
-		printf -- "-- %s" "$1"
-		[ -z "$2" ] || printf " (? for help, %s)" "$3"
-		printf ": "
-		if ! IFS= read -r reply; then
-			echo
-			[ "$3" = "required" ] && continue || reply=""
-		fi
-		case "$reply" in
-		"?") echo "$2" ;;
-		"") [ "$3" = "required" ] && continue || return 0 ;;
-		*) return 0 ;;
-		esac
-	done
-}
+export PKG

-# read_single, but optional
-optional() {
-	read_single "$1" "$2" "optional"
-}
-
-# a
-required() {
-	read_single "$1" "$2" "required"
-}
-
-# Basically the same as the single line function except multiline,
-# also it's never "required" so we don't need that handling.
-multi() {
-	echo "-- $1"
-	if [ -n "$2" ]; then
-		echo "-- (? on first line for help, Ctrl-D to finish)"
-	else
-		echo "-- (Ctrl-D to finish)"
-	fi
-	while :; do
-		reply=$(cat)
-		if [ "$(echo "$reply" | head -n 1)" = "?" ] && [ -n "$2" ]; then
-			echo "$2"
-			continue
-		fi
-
-		# removes trailing EOF and empty lines
-		reply=$(printf '%s\n' "$reply" |
-			sed 's/\x04$//' |
-			sed '/^[[:space:]]*$/d')
-
-		break
-	done
-}
-
-# the actual inputs :)
-
-required "Package repository (owner/repo)" \
-	"The remote repository this is stored on.
-You shouldn't include the host, just owner/repo is enough."
-
-REPO="$reply"
-
-required "Version of the bundled package" \
-	"The tag or commit hash of the bundled package."
-
-VERSION="$reply"
-
-optional "Package name for find_package" \
-	"When searching for system packages, this argument will be passed to find_package.
-For example, using \"Boost\" here will result in CPMUtil internally calling find_package(Boost).
-If unset, defaults to the JSON key."
-
-PACKAGE="$reply"
-
-optional "Minimum required version" \
-	"The minimum required version for this package if it's pulled in by the system."
-
-MIN_VERSION="$reply"
-
-optional "Additional find_package arguments, space-separated" \
-	"Extra arguments passed to find_package(), (e.g. CONFIG)"
-
-FIND_ARGS="$reply"
-
-optional "Git host (default: github.com)" \
-	"The hostname of the Git server, if not GitHub (e.g. codeberg.org, git.crueter.xyz)"
-
-GIT_HOST="$reply"
-
-optional "Is this a CI package? [y/N]" \
-	"Yes if the package is a prebuilt binary distribution (e.g. crueter-ci),
-no if the package is built from source if it's bundled."
-
-case "$reply" in
-[Yy]*) CI=true ;;
-*) CI=false ;;
-esac
-
-if [ "$CI" = "false" ]; then
-	optional "Name of the release artifact to download, if applicable.
-- %VERSION% is replaced by the version ($VERSION)" \
-		"Download the specified artifact from the release with the previously specified tag."
-
-	ARTIFACT="$reply"
-
-	multi "Fixed options, one per line (e.g. OPUS_BUILD_TESTING OFF)" \
-		"Fixed options passed to the project's CMakeLists.txt. Variadic options
-should be set in CMake with AddJsonPackage's OPTIONS parameter."
-
-	OPTIONS="$reply"
-else
-	required "Name of the CI artifact" \
-		"CI artifacts are stored as <name>-<platform>-<version>.tar.zst. This option controls the name."
-
-	ARTIFACT="$reply"
-
-	multi "Platforms without a package (one per line)" \
-		"Valid platforms:
-windows-amd64 windows-arm64
-mingw-amd64 mingw-arm64
-android-aarch64 android-x86_64
-linux-amd64 linux-aarch64
-macos-universal ios-aarch64"
-
-	DISABLED_PLATFORMS="$reply"
-fi
-
-# invoke add.cmake for validation
-set -- "$@" \
-	-DKEY="$PKG" \
-	-DREPO="$REPO" \
-	-DVERSION="$VERSION" \
-	-DCI="$CI"
-
-[ -z "$PACKAGE" ] || set -- "$@" -DPACKAGE="$PACKAGE"
-[ -z "$GIT_HOST" ] || set -- "$@" -DGIT_HOST="$GIT_HOST"
-[ -z "$MIN_VERSION" ] || set -- "$@" -DMIN_VERSION="$MIN_VERSION"
-[ -z "$FIND_ARGS" ] || set -- "$@" -DFIND_ARGS="$FIND_ARGS"
-[ -z "$OPTIONS" ] || set -- "$@" -DOPTIONS="$(echo "$OPTIONS" | tr '\n' ';')"
-[ -z "$ARTIFACT" ] || set -- "$@" -DARTIFACT="$ARTIFACT"
-[ -z "$DISABLED_PLATFORMS" ] || set -- "$@" -DDISABLED_PLATFORMS="$(echo "$DISABLED_PLATFORMS" | tr '\n' ';')"
-
-cmake "$@" -P "$CMAKE"/add.cmake
-
-echo "Added package $PKG to cpmfile.json. Include it in your project with AddJsonPackage($PKG)"
+"$SCRIPTS"/util/interactive.sh
@@ -0,0 +1,57 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+. "$SCRIPTS"/../common.sh
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package dir [-a|--all] [PACKAGE]...
+
+Get the local directory for the specified packages.
+
+Options:
+    -a, --all       Operate on all packages in this project.
+
+EOF
+
+	exit 0
+}
+
+while :; do
+	case "$1" in
+	-a | --all) ALL=1 ;;
+	-h | --help) usage ;;
+	"$0") break ;;
+	"") break ;;
+	*) packages="$packages $1" ;;
+	esac
+
+	shift
+done
+
+[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
+[ -n "$packages" ] || usage
+
+for pkg in $packages; do
+	unset JSON
+	export PACKAGE="$pkg"
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+
+	# TODO: common get dir func
+	if [ "$CI" = true ]; then
+		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}"
+	else
+		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+	fi
+
+	echo "-- $pkg: $dir"
+
+	if [ ! -d "$dir" ]; then
+		echo "-- * Warning: directory does not exist. Use fetch or reset to create it"
+	fi
+done
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package download [-a|--all] [PACKAGE]...
+
+Get the download URL for the specified packages.
+
+Options:
+    -a, --all       Operate on all packages in this project.
+
+EOF
+
+	exit 0
+}
+
+while :; do
+	case "$1" in
+	-a | --all) ALL=1 ;;
+	-h | --help) usage ;;
+	"$0") break ;;
+	"") break ;;
+	*) packages="$packages $1" ;;
+	esac
+
+	shift
+done
+
+[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
+[ -n "$packages" ] || usage
+
+for pkg in $packages; do
+	unset JSON
+	export PACKAGE="$pkg"
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+
+	if [ "$CI" = "true" ]; then
+		echo "-- $PACKAGE: https://$GIT_HOST/$REPO"
+	else
+		echo -- "$PACKAGE: $DOWNLOAD"
+	fi
+done
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+. "$SCRIPTS/util/fetch.sh"
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package fetch [a|--all] [PACKAGE]...
+
+Fetch the specified package or packages from their defined download locations.
+If the package is already cached, it will not be re-fetched.
+
+EOF
+
+	exit 0
+}
+
+while :; do
+	case "$1" in
+	-h | --help) usage ;;
+	-a | --all) ALL=1 ;;
+	"$0") break ;;
+	"") break ;;
+	*) packages="$packages $1" ;;
+	esac
+
+	shift
+done
+
+[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
+[ -n "$packages" ] || usage
+
+for PACKAGE in $packages; do
+	unset JSON
+	export PACKAGE
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+
+	fetch_package
+done
@@ -0,0 +1,91 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+RETURN=0
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package hash [-n|--dry-run] [-a|--all] [PACKAGE]...
+
+Check the hash of a specific package or packages.
+If a hash mismatch occurs, this script will update the package's hash.
+
+Options:
+    -n, --dry-run	Don't update the package's hash if it's a mismatch
+    -a, --all       Operate on all packages in this project.
+
+Note that this procedure will usually take a long time
+depending on the number and size of dependencies.
+
+EOF
+
+	exit $RETURN
+}
+
+while :; do
+	case "$1" in
+	-[a-z]*)
+		opt=$(printf '%s' "$1" | sed 's/^-//')
+		while [ -n "$opt" ]; do
+			# cut out first char from the optstring
+			char=$(echo "$opt" | cut -c1)
+			opt=$(echo "$opt" | cut -c2-)
+
+			case "$char" in
+			a) ALL=1 ;;
+			n) DRY=1 ;;
+			h) usage ;;
+			*) die "Invalid option -$char" ;;
+			esac
+		done
+		;;
+	--dry-run) DRY=1 ;;
+	--all) ALL=1 ;;
+	--help) usage ;;
+	"$0") break ;;
+	"") break ;;
+	*) packages="$packages $1" ;;
+	esac
+
+	shift
+done
+
+[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
+[ "$DRY" = 1 ] && UPDATE=false || UPDATE=true
+[ -n "$packages" ] || usage
+
+export UPDATE
+
+for pkg in $packages; do
+	unset JSON
+	echo "-- Package $pkg"
+
+	export PACKAGE="$pkg"
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+
+	[ "$CI" = null ] || continue
+
+	ACTUAL=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
+
+	if [ "$ACTUAL" != "$HASH" ] && [ "$QUIET" != true ]; then
+		echo "-- * Expected $HASH"
+		echo "-- * Got      $ACTUAL"
+
+		if [ "$UPDATE" != "true" ]; then
+			RETURN=1
+			continue
+		fi
+	fi
+
+	if [ "$UPDATE" = "true" ] && [ "$ACTUAL" != "$HASH" ]; then
+		NEW_JSON=$(echo "$JSON" | jq ".hash = \"$ACTUAL\"")
+
+		"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"
+	fi
+done
+
+exit $RETURN
@@ -4,13 +4,170 @@
 # SPDX-License-Identifier: LGPL-3.0-or-later

 # shellcheck disable=SC1091
+. "$SCRIPTS"/../common.sh

-printf -- "-- Enter a patch description: "
-if ! read -r description; then
-	echo "" >&2
-	echo "-- Patch cancelled" >&2
-	rm -rf "$TMP"
+RETURN=0
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package patch [PACKAGE]
+
+Create an in-tree patch for the specified package.
+
+EOF
+
+	exit "$RETURN"
+}
+
+die() {
+	echo "-- $*" >&2
+	RETURN=1 usage
+}
+
+while :; do
+	case "$1" in
+	-h | --help) usage ;;
+	"$0") break ;;
+	"") break ;;
+	*)
+		if [ -n "$PACKAGE" ]; then
+			die "You may only specify one package."
+		else
+			PACKAGE="$1"
+		fi
+		;;
+	esac
+
+	shift
+done
+
+[ -n "$PACKAGE" ] || usage
+
+unset JSON
+export PACKAGE
+
+# shellcheck disable=SC1091
+. "$SCRIPTS"/vars.sh
+
+if [ "$CI" = true ]; then
+	die "CI packages do not support in-tree patching"
+fi
+
+patch_dir="$PWD/.patch/$PACKAGE"
+TMP=$(make_temp_dir)
+
+tmp_package="${TMP}/${LOWER_PACKAGE}/${KEY}"
+
+# First fetch the package...
+
+# shellcheck disable=SC1091
+. "$SCRIPTS"/util/fetch.sh
+
+local_dir="$CPM_SOURCE_CACHE/$LOWER_PACKAGE/$KEY"
+
+if [ ! -d "$local_dir" ]; then
+	echo "-- $PACKAGE_NAME is not fetched locally" >&2
 	exit 1
 fi

-cmake -DDESCRIPTION="$description" -P "$CMAKE"/patch.cmake "$@"
+src_dir="$tmp_package/$LOWER_PACKAGE/$KEY"
+
+CPM_SOURCE_CACHE="$tmp_package" fetch_package
+
+mkdir -p "$patch_dir"
+
+existing=$(find "$patch_dir" -maxdepth 1 -type f -name '[0-9][0-9][0-9][0-9]-*.patch' 2>/dev/null | sort | tail -1)
+if [ -n "$existing" ]; then
+	last_num=$(basename "$existing" | cut -c1-4)
+	last_num=$(echo "$last_num" | sed 's/^0*//')
+	last_num="${last_num:-0}"
+	next_num=$(printf "%04d" $((last_num + 1)))
+else
+	next_num="0001"
+fi
+
+echo "-- Creating patch for $PACKAGE..."
+
+orig_dir="$PWD"
+if cmd_exists git; then
+	cd "$src_dir"
+
+	git init >/dev/null 2>&1
+	git add -A >/dev/null 2>&1
+	git commit -m "base" >/dev/null 2>&1
+
+	git --work-tree="$local_dir" add -A #>/dev/null 2>&1
+
+	if git diff --cached --quiet; then
+		echo "-- No differences found between local and source"
+		cd "$orig_dir"
+		rm -rf "$TMP"
+		exit 0
+	fi
+
+	if ! git commit -v; then
+		echo "-- Patch cancelled" >&2
+		cd "$orig_dir"
+		rm -rf "$TMP"
+		exit 1
+	fi
+
+	description=$(git log -1 --format="%s")
+
+	git format-patch -1 HEAD --stdout >"$patch_dir/tmp.patch"
+	rm -rf .git
+
+	cd "$orig_dir"
+	unset orig_dir
+else
+	if diff -ruN "$src_dir" "$local_dir" >/dev/null 2>&1; then
+		echo "-- No differences found between local and source"
+		rm -rf "$TMP"
+		exit 0
+	fi
+
+	printf -- "-- Enter a patch description: "
+	if ! read -r description; then
+		echo "" >&2
+		echo "-- Patch cancelled" >&2
+		rm -rf "$TMP"
+		exit 1
+	fi
+
+	mkdir -p "$TMP/patchdir/a" "$TMP/patchdir/b"
+	cp -r "$src_dir/." "$TMP/patchdir/a/"
+	cp -r "$local_dir/." "$TMP/patchdir/b/"
+	cd "$TMP/patchdir"
+	{
+		echo "Subject: [PATCH] $description" | fold -s -w 80
+		echo "---"
+		diff -ruN a b || true
+	} >"$patch_dir/tmp.patch"
+
+	cd "$orig_dir"
+	unset orig_dir
+fi
+
+rm -rf "$TMP"
+
+if [ ! -s "$patch_dir/tmp.patch" ]; then
+	rm -f "$patch_dir/tmp.patch"
+	echo "-- No differences found between local and source for $PACKAGE"
+	exit 0
+fi
+
+name_part=$(printf "%s" "$description" | sed 's/^[0-9]\{4\}-//' | sed 's/ /-/g; s/[^a-zA-Z0-9-]//g; s/--*/-/g; s/^-//; s/-$//')
+[ -n "$name_part" ] || name_part="patch"
+
+# max is 60 chars, minus 5 for number, minus 6 for patch suffix
+max_name_len=49
+name_part=$(printf "%s" "$name_part" | cut -c1-"$max_name_len" | sed 's/-$//')
+
+patch_name="${next_num}-${name_part}.patch"
+
+mv "$patch_dir/tmp.patch" "$patch_dir/$patch_name"
+
+NEW_JSON=$(echo "$JSON" | jq ".patches += [\"$patch_name\"]")
+"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"
+
+echo "-- Patch created at $patch_dir/$patch_name"
@@ -0,0 +1,56 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+. "$SCRIPTS"/../common.sh
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package reset [a|--all] [PACKAGE]...
+
+Reset a locally fetched package to its original state.
+This is most useful for dropping any changes you've made.
+
+EOF
+
+	exit 0
+}
+
+while :; do
+	case "$1" in
+	-h | --help) usage ;;
+	-a | --all) ALL=1 ;;
+	"$0") break ;;
+	"") break ;;
+	*) packages="$packages $1" ;;
+	esac
+
+	shift
+done
+
+[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
+[ -n "$packages" ] || usage
+
+for PACKAGE in $packages; do
+	unset JSON
+	export PACKAGE
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+
+	if [ "$CI" = true ]; then
+		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}"
+	else
+		dir="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+	fi
+
+	echo "-- Removing $dir"
+	rm -rf "$dir"
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/util/fetch.sh
+
+	fetch_package
+done
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+RETURN=0
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package rm [PACKAGE]...
+
+Delete a package or packages' cpmfile definition.
+
+EOF
+
+	exit $RETURN
+}
+
+[ $# -ge 1 ] || usage
+
+for pkg in "$@"; do
+	"$SCRIPTS"/which.sh "$pkg" || {
+		echo "!! No cpmfile definition for $pkg"
+		continue
+	}
+
+	jq --indent 4 "del(.\"$pkg\")" cpmfile.json >cpmfile.json.new
+	mv cpmfile.json.new cpmfile.json
+	echo "-- Removed $pkg"
+done
@@ -0,0 +1,174 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+filter_out() {
+	TAGS=$(echo "$TAGS" | jq "[.[] | select(.name | test(\"$1\"; \"i\") | not)]")
+}
+
+filter_in() {
+	TAGS=$(echo "$TAGS" | jq "[.[] | select(.name | test(\"$1\"; \"i\"))]")
+}
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package update [-n|--dry-run] [-a|--all] [PACKAGE]...
+
+Check a specific package or packages for updates.
+
+Options:
+    -n, --dry-run 	Do not update the package if it has an update available
+    -a, --all    	Operate on all packages in this project.
+    -c, --commit   	Automatically generate a commit message
+
+EOF
+
+	exit 0
+}
+
+while :; do
+	case "$1" in
+	-[a-z]*)
+		opt=$(printf '%s' "$1" | sed 's/^-//')
+		while [ -n "$opt" ]; do
+			# cut out first char from the optstring
+			char=$(echo "$opt" | cut -c1)
+			opt=$(echo "$opt" | cut -c2-)
+
+			case "$char" in
+			a) ALL=1 ;;
+			n) UPDATE=false ;;
+			c) COMMIT=true ;;
+			h) usage ;;
+			*) die "Invalid option -$char" ;;
+			esac
+		done
+		;;
+	--dry-run) UPDATE=false ;;
+	--all) ALL=1 ;;
+	--help) usage ;;
+	--commit) COMMIT=true ;;
+	"$0") break ;;
+	"") break ;;
+	*) packages="$packages $1" ;;
+	esac
+
+	shift
+done
+
+[ "$ALL" != 1 ] || packages="${LIBS:-$packages}"
+: "${UPDATE:=true}"
+: "${COMMIT:=false}"
+[ -n "$packages" ] || usage
+
+for pkg in $packages; do
+	unset JSON
+	export PACKAGE="$pkg"
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+
+	SKIP=$(value "skip_updates")
+
+	[ "$SKIP" != "true" ] || continue
+
+	[ "$REPO" != null ] || continue
+	[ "$GIT_HOST" = "github.com" ] || continue # TODO
+
+	[ "$CI" != "true" ] || continue
+
+	# shellcheck disable=SC2153
+	[ "$TAG" != null ] || continue
+
+	echo "-- Package $PACKAGE"
+
+	# TODO(crueter): Support for forgejo_token?
+	endpoint="/repos/$REPO/tags"
+	if command -v gh >/dev/null 2>&1; then
+		TAGS=$(gh api --method GET "$endpoint")
+	elif [ "$GIT_HOST" = github.com ]; then
+		TAGS=$(curl -sfL "https://api.github.com$endpoint")
+	else
+		TAGS=$(curl -sfL "https://$GIT_HOST/api/v1$endpoint")
+	fi
+
+	# filter out some commonly known annoyances
+	# TODO add more
+
+	if [ "$PACKAGE" = "vulkan-validation-layers" ]; then
+		filter_in vulkan-sdk
+	else
+		filter_out vulkan-sdk
+	fi
+
+	filter_out yotta # mbedtls
+
+	filter_out vksc
+
+	# ignore betas/alphas (remove if needed)
+	filter_out alpha
+	filter_out beta
+	filter_out rc
+
+	# Add package-specific overrides here, e.g. here for fmt:
+	[ "$PACKAGE" != fmt ] || filter_out v0.11
+
+	# Or for OpenSSL:
+	if [ "$PACKAGE" = openssl ]; then
+		filter_out rsaref
+		filter_in "openssl-"
+	fi
+
+	LATEST=$(echo "$TAGS" | jq -r '.[0].name')
+
+	if [ "$LATEST" = "null" ] ||
+		{ [ "$LATEST" = "$TAG" ] && [ "$FORCE" != "true" ]; }; then
+		echo "-- * Up-to-date"
+		continue
+	fi
+
+	# TODO: This is identical to version.sh
+
+	if [ "$HAS_REPLACE" = "true" ]; then
+		# this just extracts the tag prefix
+		VERSION_PREFIX=$(echo "$ORIGINAL_TAG" | cut -d"%" -f1)
+
+		# then we strip out the prefix from the new tag, and make that our new version
+		if [ -z "$VERSION_PREFIX" ]; then
+			NEW_VERSION="$LATEST"
+		else
+			NEW_VERSION=$(echo "$LATEST" | sed "s/$VERSION_PREFIX//g")
+		fi
+	else
+		NEW_VERSION="$LATEST"
+	fi
+
+	_commit="$_commit
+* $PACKAGE: $VERSION -> $NEW_VERSION"
+
+	echo "-- * Version $LATEST available, current is $TAG"
+
+	if [ "$UPDATE" = "true" ]; then
+		if [ "$HAS_REPLACE" = "true" ]; then
+			JSON=$(echo "$JSON" | jq ".version = \"$NEW_VERSION\"")
+		else
+			JSON=$(echo "$JSON" | jq ".tag = \"$NEW_VERSION\"")
+		fi
+
+		echo "-- * -- Updating hash"
+
+		# shellcheck disable=SC1091
+		. "$SCRIPTS"/vars.sh
+		HASH=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
+		JSON=$(echo "$JSON" | jq ".hash = \"$HASH\"")
+
+		"$SCRIPTS"/util/replace.sh "$PACKAGE" "$JSON"
+	fi
+done
+
+if [ "$UPDATE" = "true" ] && [ "$COMMIT" = "true" ] && [ -n "$_commit" ]; then
+	git add "cpmfile.json"
+	git commit -m "Update dependencies
+$_commit"
+fi
@@ -0,0 +1,134 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+. "$SCRIPTS"/../common.sh
+
+download_package() {
+	mkdir -p "$CPM_SOURCE_CACHE"
+
+	tmp=$(make_temp_dir)
+
+	FILENAME=$(basename "$DOWNLOAD")
+
+	OUTFILE="$tmp/$FILENAME"
+
+	OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+	if [ -d "$OUTDIR" ]; then return; fi
+
+	curl "$DOWNLOAD" -sS -L -o "$OUTFILE"
+
+	ACTUAL_HASH=$(sha512sum "$OUTFILE" | cut -d" " -f1)
+	if [ "$ACTUAL_HASH" != "$HASH" ]; then
+		echo "!! $FILENAME did not match expected hash; expected $HASH but got $ACTUAL_HASH" >&2
+		exit 1
+	fi
+
+	TMPDIR="$tmp/extracted"
+	mkdir -p "$OUTDIR"
+	mkdir -p "$TMPDIR"
+
+	PREVDIR="$PWD"
+	mkdir -p "$TMPDIR"
+	cd "$TMPDIR"
+
+	case "$FILENAME" in
+	*.7z)
+		must_install 7z
+		7z x "$OUTFILE" >/dev/null
+		;;
+	*.tar*)
+		# TODO: Extensions
+		must_install tar
+		tar xf "$OUTFILE" >/dev/null
+		;;
+	*.zip)
+		must_install unzip
+		unzip "$OUTFILE" >/dev/null
+		;;
+	esac
+
+	# basically if only one real item exists at the top we just move everything from there
+	# since github and some vendors hate me
+	DIRS=$(find . -maxdepth 1 -type d -o -type f)
+
+	# thanks gnu
+	if [ "$(echo "$DIRS" | wc -l)" -eq 2 ]; then
+		SUBDIR=$(find . -maxdepth 1 -type d -not -name ".")
+		mv "$SUBDIR"/* "$OUTDIR"
+		mv "$SUBDIR"/.* "$OUTDIR" 2>/dev/null || true
+		rmdir "$SUBDIR"
+	else
+		mv ./* "$OUTDIR"
+		mv ./.* "$OUTDIR" 2>/dev/null || true
+	fi
+
+	cd "$OUTDIR"
+
+	# TODO: Common custom patch/source cache dirs
+	if echo "$JSON" | grep -e "patches" >/dev/null; then
+		PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")')
+		for patch in $PATCHES; do
+			abs_patch="$CPMUTIL_PATCH_DIR/$PACKAGE/$patch"
+			if [ ! -f "$abs_patch" ]; then
+				echo "-- * Attempted to apply nonexistent patch $patch!"
+				continue
+			fi
+
+			echo "-- * Applying patch $patch"
+			patch --binary -p1 <"$abs_patch"
+		done
+	fi
+
+	cd "$PREVDIR"
+
+	rm -rf "$tmp"
+}
+
+# TODO: individual platform fetch?
+ci_package() {
+	[ "$REPO" != null ] || { echo "-- ! No repo defined" && return; }
+	mkdir -p "$CPM_SOURCE_CACHE"
+
+	echo "-- CI package $PACKAGE_NAME"
+
+	for platform in \
+		windows-amd64 windows-arm64 \
+		mingw-amd64 mingw-arm64 \
+		android-aarch64 android-x86_64 \
+		linux-amd64 linux-aarch64 \
+		macos-universal ios-aarch64; do
+		echo "-- * platform $platform"
+
+		case $DISABLED in
+		*"$platform"*)
+			echo "-- * -- disabled"
+			continue
+			;;
+		esac
+
+		FILENAME="${NAME}-${platform}-${VERSION}.${EXT}"
+		DOWNLOAD="https://$GIT_HOST/${REPO}/releases/download/v${VERSION}/${FILENAME}"
+		KEY="$platform-$VERSION"
+
+		OUTDIR="${CPM_SOURCE_CACHE}/${LOWER_PACKAGE}/${KEY}"
+		[ -d "$OUTDIR" ] && continue
+
+		HASH_URL="${DOWNLOAD}.sha512sum"
+
+		HASH=$(curl "$HASH_URL" -sS -q -L -o -)
+
+		download_package
+	done
+}
+
+fetch_package() {
+	if [ "$CI" = "true" ]; then
+		ci_package
+	else
+		echo "-- Downloading regular package $PACKAGE, with key $KEY, from $DOWNLOAD"
+		download_package
+	fi
+}
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+
+: "${PACKAGE:=$1}"
+
+# re-read json files
+# shellcheck disable=SC2016
+. "$SCRIPTS"/vars.sh
+
+[ "$CI" = null ] || exit 0
+
+ACTUAL=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
+
+if [ "$ACTUAL" != "$HASH" ] && [ "$QUIET" != true ]; then
+	echo "-- * Expected $HASH"
+	echo "-- * Got      $ACTUAL"
+	[ "$UPDATE" != "true" ] && exit 1
+fi
+
+if [ "$UPDATE" = "true" ] && [ "$ACTUAL" != "$HASH" ]; then
+	NEW_JSON=$(echo "$JSON" | jq ".hash = \"$ACTUAL\"")
+
+	"$SCRIPTS"/util/replace.sh "$PACKAGE" "$NEW_JSON"
+fi
@@ -0,0 +1,228 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# This reads a single-line input from the user and also gives them
+# help if needed.
+# $1: The prompt itself, without any trailing spaces or whatever
+# $2: The help text that gets shown when the user types a question mark
+# $3: This is set to "required" if it's necessary,
+#     otherwise it can continue without input.
+# Stores its output in the "reply" variable
+read_single() {
+	while :; do
+		printf -- "-- %s" "$1"
+		[ -z "$2" ] || printf " (? for help, %s)" "$3"
+		printf ": "
+		if ! IFS= read -r reply; then
+			echo
+			[ "$3" = "required" ] && continue || reply=""
+		fi
+		case "$reply" in
+		"?") echo "$2" ;;
+		"") [ "$3" = "required" ] && continue || return 0 ;;
+		*) return 0 ;;
+		esac
+	done
+}
+
+# read_single, but optional
+optional() {
+	read_single "$1" "$2" "optional"
+}
+
+# a
+required() {
+	read_single "$1" "$2" "required"
+}
+
+# Basically the same as the single line function except multiline,
+# also it's never "required" so we don't need that handling.
+multi() {
+	echo "-- $1"
+	if [ -n "$2" ]; then
+		echo "-- (? on first line for help, Ctrl-D to finish)"
+	else
+		echo "-- (Ctrl-D to finish)"
+	fi
+	while :; do
+		reply=$(cat)
+		if [ "$(echo "$reply" | head -n 1)" = "?" ] && [ -n "$2" ]; then
+			echo "$2"
+			continue
+		fi
+
+		# removes trailing EOF and empty lines
+		reply=$(printf '%s\n' "$reply" |
+			sed 's/\x04$//' |
+			sed '/^[[:space:]]*$/d')
+
+		break
+	done
+}
+
+# the actual inputs :)
+
+required "Package repository (owner/repo)" \
+	"The remote repository this is stored on.
+You shouldn't include the host, just owner/repo is enough."
+
+REPO="$reply"
+
+optional "Package name for find_package" \
+	"When searching for system packages, this argument will be passed to find_package.
+For example, using \"Boost\" here will result in CPMUtil internally calling find_package(Boost)."
+
+PACKAGE="$reply"
+
+optional "Minimum required version" \
+	"The minimum required version for this package if it's pulled in by the system."
+
+MIN_VERSION="$reply"
+
+optional "Additional find_package arguments, space-separated" \
+	"Extra arguments passed to find_package(), (e.g. CONFIG)"
+
+FIND_ARGS="$reply"
+
+optional "Git host (default: github.com)" \
+	"The hostname of the Git server, if not GitHub (e.g. codeberg.org, git.crueter.xyz)"
+
+GIT_HOST="$reply"
+
+required "Numeric version of the bundled package" \
+	"The semantic version of the bundled package. This is only used for package identification,
+and if you use tag/artifact fetching. Do not input the entire tag here; for example, if you're using
+tag v1.3.0, then set this to 1.3.0 and set the tag to v%VERSION%."
+
+VERSION="$reply"
+
+optional "Is this a CI package? [y/N]" \
+	"Yes if the package is a prebuilt binary distribution (e.g. crueter-ci),
+no if the package is built from source if it's bundled."
+
+case "$reply" in
+[Yy]*) CI=true ;;
+*) CI=false ;;
+esac
+
+if [ "$CI" = "false" ]; then
+	while :; do
+		required "Use tag or commit sha versioning? [tag/sha]" \
+			"Tag versioning is compatible with auto-updating.
+Use sha versioning for projects with improper tagging practices"
+
+		if [ "$reply" = "tag" ]; then
+			TAG=1
+			break
+		elif [ "$reply" = "sha" ]; then
+			SHA=1
+			break
+		else
+			echo "-- Invalid choice $reply"
+		fi
+	done
+
+	if [ "$TAG" = "1" ]; then
+		optional "Name of the upstream tag. %VERSION% is replaced by the numeric version ($VERSION) (default: %VERSION%)" \
+			"Most commonly this will be something like v%VERSION% or release-%VERSION%, or just %VERSION%."
+
+		TAGNAME="$reply"
+		[ -n "$TAGNAME" ] || TAGNAME="%VERSION%"
+
+		optional "Name of the release artifact to download, if applicable.
+-- %VERSION% is replaced by the numeric version ($VERSION) and %TAG% is replaced by the tag name" \
+			"Download the specified artifact from the release with the previously specified tag.
+If unspecified, the source code at the specified tag will be used instead."
+
+		ARTIFACT="$reply"
+	else
+		required "Commit sha" \
+			"The short Git commit sha to use. You're recommended to keep this short, e.g. 10 characters."
+
+		SHA="$reply"
+	fi
+
+	multi "Fixed options, one per line (e.g. OPUS_BUILD_TESTING OFF)" \
+		"Fixed options passed to the project's CMakeLists.txt. Variadic options
+should be set in CMake with AddJsonPackage's OPTIONS parameter."
+
+	OPTIONS="$reply"
+else
+	required "Name of the CI artifact" \
+		"CI artifacts are stored as <name>-<platform>-<version>.tar.zst. This option controls the name."
+
+	ARTIFACT="$reply"
+
+	multi "Platforms without a package (one per line)" \
+		"Valid platforms:
+windows-amd64 windows-arm64
+mingw-amd64 mingw-arm64
+android-aarch64 android-x86_64
+linux-amd64 linux-aarch64
+macos-universal ios-aarch64"
+
+	DISABLED_PLATFORMS="$reply"
+fi
+
+# now time to construct the actual json
+jq_input='{repo: "'"$REPO"'"}'
+
+# common trivial fields
+[ -z "$PACKAGE" ] || jq_input="$jq_input + {package: \"$PACKAGE\"}"
+[ -z "$MIN_VERSION" ] || jq_input="$jq_input + {min_version: \"$MIN_VERSION\"}"
+[ -z "$FIND_ARGS" ] || jq_input="$jq_input + {find_args: \"$FIND_ARGS\"}"
+jq_input="$jq_input + {version: \"$VERSION\"}"
+
+if [ -n "$GIT_HOST" ] && [ "$GIT_HOST" != "github.com" ]; then
+	jq_input="$jq_input + {git_host: \"$GIT_HOST\"}"
+fi
+
+if [ "$CI" = "true" ]; then
+	jq_input="$jq_input + {
+        ci: true,
+        artifact: \"$ARTIFACT\"
+    }"
+
+	# disabled platforms
+	if [ -n "$DISABLED_PLATFORMS" ] && [ -n "$(printf '%s' "$DISABLED_PLATFORMS" | tr -d ' \t\n\r')" ]; then
+		disabled_json=$(printf '%s\n' "$DISABLED_PLATFORMS" | jq -R . | jq -s .)
+		jq_input="$jq_input + {disabled_platforms: $disabled_json}"
+	fi
+else
+	[ -z "$MIN_VERSION" ] || jq_input="$jq_input + {version: \"$MIN_VERSION\"}"
+	jq_input="$jq_input + {hash: \"\"}"
+
+	# options
+	if [ -n "$OPTIONS" ] && [ -n "$(printf '%s' "$OPTIONS" | tr -d ' \t\n\r')" ]; then
+		options_json=$(printf '%s\n' "$OPTIONS" | jq -R . | jq -s .)
+		jq_input="$jq_input + {options: $options_json}"
+	fi
+
+	# versioning stuff
+	if [ "$TAG" = 1 ]; then
+		jq_input="$jq_input + {tag: \"$TAGNAME\"}"
+		[ -z "$ARTIFACT" ] || jq_input="$jq_input + {artifact: \"$ARTIFACT\"}"
+	else
+		jq_input="$jq_input + {sha: \"$SHA\"}"
+	fi
+fi
+
+JSON=$(jq -n "$jq_input")
+
+# shellcheck disable=SC1091
+. "$SCRIPTS"/vars.sh
+
+if [ "$CI" != true ]; then
+	HASH=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
+	JSON=$(echo "$JSON" | jq ".hash = \"$HASH\"")
+fi
+
+jq --arg key "$PKG" --argjson new "$JSON" \
+	'.[$key] = $new' "cpmfile.json" --indent 4 >"cpmfile.json.tmp" &&
+	mv "cpmfile.json.tmp" cpmfile.json
+
+"$SCRIPTS"/format.sh
+
+echo "Added package $PKG to cpmfile.json. Include it in your project with AddJsonPackage($PKG)"
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# Replace a specified package with a modified json.
+
+jq --indent 4 --argjson repl "$2" ".\"$1\" *= \$repl" cpmfile.json >cpmfile.json.new
+mv cpmfile.json.new cpmfile.json
+
+echo "-- * -- Updated cpmfile.json"
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: Copyright 2025 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+SUM=$(curl -Ls "$1" -o - | sha512sum)
+echo "$SUM" | cut -d " " -f1
@@ -0,0 +1,27 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# Get the download URL for a package
+
+if [ "$URL" != "null" ]; then
+	DOWNLOAD="$URL"
+elif [ "$REPO" != "null" ]; then
+	GIT_URL="https://$GIT_HOST/$REPO"
+
+	if [ "$SHA" != "null" ]; then
+		DOWNLOAD="${GIT_URL}/archive/${SHA}.tar.gz"
+	elif [ "$TAG" != "null" ]; then
+		if [ "$ARTIFACT" != "null" ]; then
+			DOWNLOAD="${GIT_URL}/releases/download/${TAG}/${ARTIFACT}"
+		else
+			DOWNLOAD="${GIT_URL}/archive/refs/tags/${TAG}.tar.gz"
+		fi
+	fi
+else
+	echo "!! No repo or URL defined for $PACKAGE_NAME"
+	exit 1
+fi
+
+export DOWNLOAD
@@ -0,0 +1,158 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+
+value() {
+	echo "$JSON" | jq -r ".$1"
+}
+
+if [ -z "$JSON" ]; then
+	[ -n "$PACKAGE" ] || { echo "Package was not specified" && exit 0; }
+
+	# shellcheck disable=SC2153
+	JSON=$(jq -r ".\"$PACKAGE\" | select( . != null )" cpmfile.json)
+
+	if [ -z "$JSON" ]; then
+		echo "!! No cpmfile definition for $PACKAGE" >&2
+		exit 1
+	fi
+fi
+
+# unset stuff
+export PACKAGE_NAME="null"
+export REPO="null"
+export CI="null"
+export GIT_HOST="null"
+export EXT="null"
+export NAME="null"
+export DISABLED="null"
+export TAG="null"
+export ARTIFACT="null"
+export SHA="null"
+export VERSION="null"
+export MIN_VERSION="null"
+export DOWNLOAD="null"
+export URL="null"
+export KEY="null"
+export HASH="null"
+export ORIGINAL_TAG="null"
+export HAS_REPLACE="null"
+export VERSION_REPLACE="null"
+
+########
+# Meta #
+########
+
+REPO=$(value "repo")
+CI=$(value "ci")
+
+PACKAGE_NAME=$(value "package")
+[ "$PACKAGE_NAME" != null ] || PACKAGE_NAME="$PACKAGE"
+
+GIT_HOST=$(value "git_host")
+[ "$GIT_HOST" != null ] || GIT_HOST=github.com
+
+# used for cache key
+LOWER_PACKAGE=$(echo "$PACKAGE_NAME" | tr '[:upper:]' '[:lower:]')
+
+export PACKAGE_NAME
+export LOWER_PACKAGE
+export REPO
+export CI
+export GIT_HOST
+
+######################
+# CI Package Parsing #
+######################
+
+MIN_VERSION=$(value "min_version")
+VERSION=$(value "version")
+
+export VERSION
+export MIN_VERSION
+
+if [ "$CI" = "true" ]; then
+	EXT=$(value "extension")
+	[ "$EXT" != null ] || EXT="tar.zst"
+
+	NAME=$(value "name")
+	DISABLED=$(echo "$JSON" | jq -j '.disabled_platforms')
+
+	[ "$NAME" != null ] || NAME="$PACKAGE_NAME"
+
+	export EXT
+	export NAME
+	export DISABLED
+
+	return 0
+fi
+
+##############
+# Versioning #
+##############
+
+TAG=$(value "tag")
+ARTIFACT=$(value "artifact")
+SHA=$(value "sha")
+
+if echo "$TAG" | grep -e "%VERSION%" >/dev/null; then
+	HAS_REPLACE=true
+else
+	HAS_REPLACE=false
+fi
+
+ORIGINAL_TAG="$TAG"
+
+TAG=$(echo "$TAG" | sed "s/%VERSION%/$VERSION/g")
+ARTIFACT=$(echo "$ARTIFACT" | sed "s/%VERSION%/$VERSION/g")
+ARTIFACT=$(echo "$ARTIFACT" | sed "s/%TAG%/$TAG/g")
+
+export TAG
+export ARTIFACT
+export SHA
+export VERSION
+export ORIGINAL_TAG
+export HAS_REPLACE
+
+###############
+# URL Parsing #
+###############
+
+URL=$(value "url")
+
+. "$SCRIPTS"/util/url.sh
+
+export DOWNLOAD
+
+###############
+# Key Parsing #
+###############
+
+if [ "$SHA" != null ]; then
+	KEY=$(echo "$SHA" | cut -c1-4)
+elif [ "$VERSION" != null ]; then
+	KEY="$VERSION"
+elif [ "$TAG" != null ]; then
+	KEY="$TAG"
+else
+	echo "!! No valid key could be determined for $PACKAGE_NAME. Must define one of: sha, tag, version"
+	exit 1
+fi
+
+export KEY
+
+################
+# Hash Parsing #
+################
+
+HASH=$(value "hash")
+
+if [ "$HASH" = null ]; then
+	echo "!! No hash defined for $PACKAGE_NAME" >&2
+fi
+
+export HASH
+export JSON
@@ -0,0 +1,62 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# shellcheck disable=SC1091
+
+usage() {
+	cat <<EOF
+Usage: cpmutil.sh package version [PACKAGE] [VERSION]
+
+Update a package's version. If the package uses a sha, you must provide a sha,
+and if the package uses a tag, you must provide the fully qualified tag.
+
+EOF
+
+	exit 0
+}
+
+PACKAGE="$1"
+NEW_VERSION="$2"
+
+[ -n "$PACKAGE" ] || usage
+[ -n "$NEW_VERSION" ] || usage
+
+export PACKAGE
+
+. "$SCRIPTS"/vars.sh
+
+[ "$REPO" != null ] || exit 0
+
+if [ "$HAS_REPLACE" = "true" ]; then
+	# this just extracts the tag prefix
+	VERSION_PREFIX=$(echo "$ORIGINAL_TAG" | cut -d"%" -f1)
+
+	# then we strip out the prefix from the new tag, and make that our new git_version
+	if [ -n "$VERSION_PREFIX" ]; then
+		NEW_VERSION=$(echo "$NEW_VERSION" | sed "s/$VERSION_PREFIX//g")
+	fi
+fi
+
+if [ "$SHA" != null ]; then
+	JSON=$(echo "$JSON" | jq ".sha = \"$NEW_VERSION\"")
+elif [ "$CI" = "true" ] || [ "$HAS_REPLACE" = "true" ]; then
+	JSON=$(echo "$JSON" | jq ".version = \"$NEW_VERSION\"")
+else
+	JSON=$(echo "$JSON" | jq ".tag = \"$NEW_VERSION\"")
+fi
+
+echo "-- * Updating $PACKAGE to version $NEW_VERSION"
+
+# TODO: ci hash thing please
+if [ "$CI" != true ]; then
+	echo "-- * -- Updating hash"
+
+	# shellcheck disable=SC1091
+	. "$SCRIPTS"/vars.sh
+	HASH=$("$SCRIPTS"/util/url-hash.sh "$DOWNLOAD")
+	JSON=$(echo "$JSON" | jq ".hash = \"$HASH\"")
+fi
+
+"$SCRIPTS"/util/replace.sh "$PACKAGE" "$JSON"
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2026 crueter
+# SPDX-License-Identifier: LGPL-3.0-or-later
+
+# check if a package is defined
+
+echo "$LIBS" | grep "$1" >/dev/null 2>&1
@@ -7,7 +7,8 @@

 ROOTDIR=$(CDPATH='' cd -- "$(dirname -- "$0")/cpm" && pwd)
 SCRIPTS="$ROOTDIR"
-CMAKE="$ROOTDIR/cmake"
+
+. "$SCRIPTS"/common.sh

 RETURN=0

@@ -25,55 +26,33 @@ General command-line utility for CPMUtil operations.
 Commands:
    package Run operations on a package or packages
    format  Format cpmfile
-    ls  	List all packages in the cpmfile
    update  Update CPMUtil and its tooling
    migrate Convert submodules to a basic cpmfile

 Package commands:
-    hash            	Verify the hash of a package, and update it if needed
-    update          	Check for updates for a package
-    fetch           	Fetch a package and place it in the cache
-    add             	Add a new package
-    rm              	Remove a package
-    version         	Change the version of a package
-    which           	Check if a package is defined
-    url             	Get the download URL for a package
-    dir             	Get the local directory for a package
-    reset           	Reset a fetched package to its original state
-    patch           	Create an in-tree patch based on local modifications
+    hash    	Verify the hash of a package, and update it if needed
+    update  	Check for updates for a package
+    fetch   	Fetch a package and place it in the cache
+    add     	Add a new package
+    rm      	Remove a package
+    version 	Change the version of a package
+    which   	Check if a package is defined
+    download 	Get the download URL for a package
+    dir     	Get the local directory for a package
+    reset   	Reset a fetched package to its original state
+    patch   	Create an in-tree patch based on local modifications

 EOF

 	exit $RETURN
 }

-export ROOTDIR CMAKE SCRIPTS
+export ROOTDIR

 while :; do
 	case "$1" in
-	format | update)
-		cmake -P "$CMAKE/$1".cmake
-		break
-		;;
-	ls)
-		shift
-		print_usage=false
-		filtered=""
-		for arg in "$@"; do
-			case "$arg" in
-			-h | --help) print_usage=true ;;
-			-n) ;;
-			*) filtered="$filtered $arg" ;;
-			esac
-		done
-		cmake_defines=""
-		$print_usage && cmake_defines="-DPRINT_USAGE=TRUE"
-		# shellcheck disable=SC2086
-		cmake $cmake_defines -P "$CMAKE/ls.cmake" -- $filtered
-		break
-		;;
-	migrate)
-		"$SCRIPTS"/migrate.sh
+	format | update | migrate)
+		"$SCRIPTS/$1".sh
 		break
 		;;
 	package)
Author	SHA1	Message	Date
CamilleLaVey	3352f0662c	[vulkan] Correction on unconditional/ harcoded makeview 2D array vs compute shader 3D views	2026-07-03 17:54:55 -04:00
CamilleLaVey	95e42257f7	[vulkan] Added buffer memory barrier to keep track of previous buffer's active transfer	2026-07-03 16:47:49 -04:00
CamilleLaVey	8961bc37f3	[vulkan] Added transfer bits to compute memory barriers	2026-07-03 15:37:19 -04:00
CamilleLaVey	e1e8ae68bf	[vulkan] First intent on unswizzling via gpu shaders	2026-07-03 03:25:45 -04:00