diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index a7be01ab80..575a478a8e 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -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 # This function downloads a binary library package from our external repo. @@ -17,6 +17,9 @@ if (WIN32) elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_repo "ext-linux-bin/-/raw/main/") set(package_extension ".tar.xz") +# elseif (APPLE) +# set(package_repo "ext-osx-bin/-/raw/main/") +# set(package_extension ".dmg") elseif (ANDROID) set(package_repo "ext-android-bin/-/raw/main/") set(package_extension ".tar.xz") diff --git a/dist/suyu.icns b/dist/suyu.icns index b1d97f93af..341297e790 100644 Binary files a/dist/suyu.icns and b/dist/suyu.icns differ diff --git a/src/suyu/CMakeLists.txt b/src/suyu/CMakeLists.txt index 01ccc2502a..1c7354f545 100644 --- a/src/suyu/CMakeLists.txt +++ b/src/suyu/CMakeLists.txt @@ -357,7 +357,7 @@ if (APPLE) if (NOT USE_SYSTEM_MOLTENVK) set(MOLTENVK_PLATFORM "macOS") - set(MOLTENVK_VERSION "v1.2.7") + set(MOLTENVK_VERSION "v1.2.8") download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION}) endif() find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED) diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index cc2656ef70..d5b10c6963 100644 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -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 #include @@ -162,6 +162,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array& color) { }; } + [[nodiscard]] vk::Image MakeImage(const Device& device, const MemoryAllocator& allocator, const ImageInfo& info, std::span view_formats) { const bool is_buffer = (info.type == ImageType::Buffer);