[Mac OS X] Add KosmicKrisp builds (for evaluation/testing)

Author: schm1dtmac

.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

.ci/deploy-mac.sh

@@ -5,11 +5,19 @@ cd build || exit 1
 
 cd bin
 mkdir -p "rpcs3.app/Contents/Resources/vulkan/icd.d" || true
-wget https://github.com/KhronosGroup/MoltenVK/releases/download/v1.4.2-rc1/MoltenVK-macos-privateapi.tar
-tar -xvf MoltenVK-macos-privateapi.tar
-cp "MoltenVK/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" "rpcs3.app/Contents/Frameworks/libMoltenVK.dylib"
-cp "MoltenVK/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
+  wget https://github.com/KhronosGroup/MoltenVK/releases/download/v1.4.2-rc1/MoltenVK-macos-privateapi.tar
+  tar -xvf MoltenVK-macos-privateapi.tar
+  cp "MoltenVK/MoltenVK/dynamic/dylib/macOS/libMoltenVK.dylib" "rpcs3.app/Contents/Frameworks/libMoltenVK.dylib"
+  cp "MoltenVK/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"

.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

rpcs3/Emu/RSX/VK/VKCompute.cpp

@@ -77,6 +77,7 @@ namespace vk
 				break;
 			case vk::driver_vendor::MVK:
 			case vk::driver_vendor::HONEYKRISP:
+			case vk::driver_vendor::KOSMICKRISP:
 				unroll_loops = true;
 				optimal_kernel_size = 1;
 				optimal_group_size = 256;

rpcs3/Emu/RSX/VK/VKHelpers.cpp

@@ -143,6 +143,9 @@ namespace vk
 		case driver_vendor::HONEYKRISP:
 			// Needs more testing
 			break;
+		case driver_vendor::KOSMICKRISP:
+			 // Needs more testing
+			 break;
 		case driver_vendor::PANVK:
 			// Needs more testing
 			break;

rpcs3/Emu/RSX/VK/VKRenderTargets.h

@@ -209,6 +209,7 @@ namespace vk
 			case driver_vendor::LAVAPIPE:
 			case driver_vendor::V3DV:
 			case driver_vendor::HONEYKRISP:
+			case driver_vendor::KOSMICKRISP:
 			case driver_vendor::PANVK:
 			case driver_vendor::ARM_MALI:
 				break;

rpcs3/Emu/RSX/VK/VulkanAPI.h

@@ -40,6 +40,10 @@
 constexpr VkDriverId VK_DRIVER_ID_MESA_HONEYKRISP = static_cast<VkDriverId>(26);
 #endif
 
+#if VK_HEADER_VERSION < 287
+constexpr VkDriverId VK_DRIVER_ID_MESA_KOSMICKRISP = static_cast<VkDriverId>(28);
+#endif
+
 #if VK_HEADER_VERSION < 332
 #define VK_EXT_shader_uniform_buffer_unsized_array 1
 #define VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION 1

rpcs3/Emu/RSX/VK/vkutils/chip_class.h

@@ -56,6 +56,7 @@ namespace vk
 		NVK,
 		V3DV,
 		HONEYKRISP,
+		KOSMICKRISP,
 		PANVK,
 		ARM_MALI
 	};

rpcs3/Emu/RSX/VK/vkutils/device.cpp

@@ -285,12 +285,6 @@ namespace vk
 
 	driver_vendor physical_device::get_driver_vendor() const
 	{
-#ifdef __APPLE__
-		// moltenVK currently returns DRIVER_ID_MOLTENVK (0).
-		// For now, assume the vendor is moltenVK on Apple devices.
-		return driver_vendor::MVK;
-#endif
-
 		if (!driver_properties.driverID)
 		{
 			const auto gpu_name = get_name();
@@ -341,7 +335,11 @@ namespace vk
 
 			if (gpu_name.find("Apple") != umax)
 			{
+#ifdef __APPLE__
+				return driver_vendor::KOSMICKRISP;
+#else
 				return driver_vendor::HONEYKRISP;
+#endif
 			}
 
 			if (gpu_name.find("Panfrost") != umax)
@@ -380,10 +378,14 @@ namespace vk
 				return driver_vendor::V3DV;
 			case VK_DRIVER_ID_MESA_HONEYKRISP:
 				return driver_vendor::HONEYKRISP;
+			case VK_DRIVER_ID_MESA_KOSMICKRISP:
+				return driver_vendor::KOSMICKRISP;
 			case VK_DRIVER_ID_MESA_PANVK:
 				return driver_vendor::PANVK;
 			case VK_DRIVER_ID_ARM_PROPRIETARY:
 				return driver_vendor::ARM_MALI;
+			case VK_DRIVER_ID_MOLTENVK:
+				return driver_vendor::MVK;
 			default:
 				// Mobile?
 				return driver_vendor::unknown;