Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3rdParty: Bump MoltenVK to 1.2.5 - Vulkan SDK 1.3.261 #14496

Merged
merged 6 commits into from
Aug 18, 2023
Merged

3rdParty: Bump MoltenVK to 1.2.5 - Vulkan SDK 1.3.261 #14496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2f2d81
Bump MoltenVK to 1.2.5
shinra-electric Aug 16, 2023
0fc1f6b
Add link for homebrew MVK 1.2.5 to Mac build script
shinra-electric Aug 17, 2023
3eeeab3
Merge branch 'master' into moltenvk-125
shinra-electric Aug 17, 2023
67fa13c
Merge branch 'master' into moltenvk-125
shinra-electric Aug 17, 2023
8372d90
Merge branch 'master' into moltenvk-125
elad335 Aug 18, 2023
5448d14
Merge branch 'master' into moltenvk-125
Megamouse Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/build-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ arch -x86_64 /usr/local/bin/brew update
arch -x86_64 /usr/local/bin/brew install -f --overwrite llvm@16 glew cmake sdl2 vulkan-headers ffmpeg
arch -x86_64 /usr/local/bin/brew link -f llvm@16

# moltenvk based on commit for 1.2.4 release
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/b233d4f9f40f26d81da11140defbfd578cfe4a69/Formula/molten-vk.rb
# moltenvk based on commit for 1.2.5 release
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/055ae78415b61ecf1fa3de32b76b8a149855f903/Formula/m/molten-vk.rb
arch -x86_64 /usr/local/bin/brew install -f --overwrite ./molten-vk.rb
#export MACOSX_DEPLOYMENT_TARGET=12.0
export CXX=clang++
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/MoltenVK/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include(ExternalProject)

ExternalProject_Add(moltenvk
GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
GIT_TAG 4c6bfbe
GIT_TAG b3c9f86
BUILD_IN_SOURCE 1
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK
CONFIGURE_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK/fetchDependencies" --macos
Expand Down