gitlab-com-suyu-emu/suyu
1
0
Fork 0
mirror of https://gitlab.com/suyu-emu/suyu.git synced 2024-03-15 23:15:44 +00:00
Code Issues Projects Releases Wiki Activity

Updating moltenVK and macOS icon

Browse source
This commit is contained in:
Amir Abravesh 2024-03-13 13:00:31 +00:00 committed by Crimson Hawk
parent 84aa715eb1
commit 9895cc94d0
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeModules/DownloadExternals.cmake
View file

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2017 yuzu Emulator Project # SPDX-FileCopyrightText: 2017 yuzu Emulator Project & 2024 suyu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# This function downloads a binary library package from our external repo. # This function downloads a binary library package from our external repo.
@ -17,6 +17,9 @@ if (WIN32)
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(package_repo "ext-linux-bin/-/raw/main/") set(package_repo "ext-linux-bin/-/raw/main/")
set(package_extension ".tar.xz") set(package_extension ".tar.xz")
# elseif (APPLE)
# set(package_repo "ext-osx-bin/-/raw/main/")
# set(package_extension ".dmg")
elseif (ANDROID) elseif (ANDROID)
set(package_repo "ext-android-bin/-/raw/main/") set(package_repo "ext-android-bin/-/raw/main/")
set(package_extension ".tar.xz") set(package_extension ".tar.xz")

BIN
dist/suyu.icns vendored
View file

Binary file not shown.

2
src/suyu/CMakeLists.txt
View file

@ -357,7 +357,7 @@ if (APPLE)
if (NOT USE_SYSTEM_MOLTENVK) if (NOT USE_SYSTEM_MOLTENVK)
set(MOLTENVK_PLATFORM "macOS") set(MOLTENVK_PLATFORM "macOS")
set(MOLTENVK_VERSION "v1.2.7") set(MOLTENVK_VERSION "v1.2.8")
download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION}) download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
endif() endif()
find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED) find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)

3
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View file

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project & 2024 suyu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
#include <algorithm> #include <algorithm>
@ -162,6 +162,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
}; };
} }
[[nodiscard]] vk::Image MakeImage(const Device& device, const MemoryAllocator& allocator, [[nodiscard]] vk::Image MakeImage(const Device& device, const MemoryAllocator& allocator,
const ImageInfo& info, std::span<const VkFormat> view_formats) { const ImageInfo& info, std::span<const VkFormat> view_formats) {
const bool is_buffer = (info.type == ImageType::Buffer); const bool is_buffer = (info.type == ImageType::Buffer);