diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index ae0341cc0e..166f1dc96c 100755 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -13,6 +13,15 @@ export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 export HOMEBREW_NO_ENV_HINTS=1 export HOMEBREW_NO_INSTALL_CLEANUP=1 +if [ "$BUILD_MAC_KK" -eq 1 ]; then + git clone https://gitlab.freedesktop.org/mesa/mesa.git kosmickrisp; cd kosmickrisp + brew install meson libclc spirv-llvm-translator spirv-tools + pip3 install mako packaging pyyaml --break-system-packages + export PATH="/opt/homebrew/opt/llvm/bin:$PATH" + meson setup build --prefix=/opt/homebrew --buildtype=release -Dplatforms=macos -Dvulkan-drivers=kosmickrisp -Dgallium-drivers= -Dopengl=false -Dzstd=disabled + ninja -C build; cd ../ +fi + brew install -f --overwrite --quiet ccache "llvm@$LLVM_COMPILER_VER" brew link -f --overwrite --quiet "llvm@$LLVM_COMPILER_VER" brew install -f --overwrite --quiet googletest opencv@4 sdl3 vulkan-headers vulkan-loader molten-vk diff --git a/.ci/deploy-mac.sh b/.ci/deploy-mac.sh index 045b93ac9f..2fc87261a8 100755 --- a/.ci/deploy-mac.sh +++ b/.ci/deploy-mac.sh @@ -4,16 +4,23 @@ cd build || exit 1 cd bin -git clone --revision=a075e5e417f87675ea3137b7365f3e5a99608d72 https://github.com/KhronosGroup/MoltenVK.git -cd MoltenVK -./fetchDependencies --macos -make macos MVK_USE_METAL_PRIVATE_API=1 -cd ../ - mkdir -p "rpcs3.app/Contents/Resources/vulkan/icd.d" || true -cp "MoltenVK/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" "rpcs3.app/Contents/Frameworks/libMoltenVK.dylib" -cp "MoltenVK/Package/Release/MoltenVK/dynamic/dylib/macOS/MoltenVK_icd.json" "rpcs3.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json" -sed -i '' "s/.\//..\/..\/..\/Frameworks\//g" "rpcs3.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json" +if [ "$BUILD_MAC_KK" -eq 1 ]; then + cp "$WORKDIR/kosmickrisp/build/src/kosmickrisp/vulkan/libvulkan_kosmickrisp.dylib" "rpcs3.app/Contents/Frameworks/libvulkan_kosmickrisp.dylib" + cp "$WORKDIR/kosmickrisp/build/src/kosmickrisp/vulkan/kosmickrisp_mesa_icd.aarch64.json" "rpcs3.app/Contents/Resources/vulkan/icd.d/kosmickrisp_mesa_icd.aarch64.json" + cp "$(realpath /opt/homebrew/lib/libSPIRV-Tools.dylib)" "rpcs3.app/Contents/Frameworks/libSPIRV-Tools.dylib" + install_name_tool -change "/opt/homebrew/opt/spirv-tools/lib/libSPIRV-Tools.dylib" "@rpath/libSPIRV-Tools.dylib" "rpcs3.app/Contents/Frameworks/libvulkan_kosmickrisp.dylib" + sed -i '' "s/\/opt\/homebrew\/lib\//..\/..\/..\/Frameworks\//g" "rpcs3.app/Contents/Resources/vulkan/icd.d/kosmickrisp_mesa_icd.aarch64.json" +else + git clone --revision=a075e5e417f87675ea3137b7365f3e5a99608d72 https://github.com/KhronosGroup/MoltenVK.git + cd MoltenVK + ./fetchDependencies --macos + make macos MVK_USE_METAL_PRIVATE_API=1 + cd ../ + cp "MoltenVK/Package/Release/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" "rpcs3.app/Contents/Frameworks/libMoltenVK.dylib" + cp "MoltenVK/Package/Release/MoltenVK/dynamic/dylib/macOS/MoltenVK_icd.json" "rpcs3.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json" + sed -i '' "s/.\//..\/..\/..\/Frameworks\//g" "rpcs3.app/Contents/Resources/vulkan/icd.d/MoltenVK_icd.json" +fi cp "$(realpath $BREW_PATH/opt/llvm@$LLVM_COMPILER_VER/lib/c++/libc++abi.1.0.dylib)" "rpcs3.app/Contents/Frameworks/libc++abi.1.dylib" cp "$(realpath $BREW_PATH/opt/gcc/lib/gcc/current/libgcc_s.1.1.dylib)" "rpcs3.app/Contents/Frameworks/libgcc_s.1.1.dylib" diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 515555a224..982fbcfd99 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -130,6 +130,11 @@ jobs: runs-on: macos-15 UPLOAD_COMMIT_HASH: 8e21bdbc40711a3fccd18fbf17b742348b0f4281 UPLOAD_REPO_FULL_NAME: rpcs3/rpcs3-binaries-mac-arm64 + - name: Apple Silicon (KosmicKrisp) + runs-on: macos-26 + BUILD_MAC_KK: 1 + UPLOAD_COMMIT_HASH: "" + UPLOAD_REPO_FULL_NAME: "" name: RPCS3 Mac ${{ matrix.name }} runs-on: ${{ matrix.runs-on }} env: @@ -140,6 +145,7 @@ jobs: RELEASE_MESSAGE: ../GitHubReleaseMessage.txt UPLOAD_COMMIT_HASH: ${{ matrix.UPLOAD_COMMIT_HASH }} UPLOAD_REPO_FULL_NAME: ${{ matrix.UPLOAD_REPO_FULL_NAME }} + BUILD_MAC_KK: ${{ matrix.BUILD_MAC_KK }} RUN_UNIT_TESTS: ${{ matrix.name == 'Apple Silicon' && (github.event_name == 'pull_request' && 'ON') || 'OFF' }} steps: - name: Checkout repository @@ -183,6 +189,7 @@ jobs: - name: Deploy master build to GitHub Releases if: | + env.BUILD_MAC_KK == 0 && github.event_name != 'pull_request' && github.repository == 'RPCS3/rpcs3' && github.ref == 'refs/heads/master' @@ -191,14 +198,14 @@ jobs: run: .ci/github-upload.sh - name: Save Build Ccache - if: github.ref == 'refs/heads/master' + if: env.BUILD_MAC_KK == 0 && github.ref == 'refs/heads/master' uses: actions/cache/save@main with: path: ${{ env.CCACHE_DIR }} key: ${{ steps.restore-build-ccache.outputs.cache-primary-key }} - name: Save Qt Cache - if: github.ref == 'refs/heads/master' + if: env.BUILD_MAC_KK == 0 && github.ref == 'refs/heads/master' uses: actions/cache/save@main with: path: /tmp/Qt