Procházet zdrojové kódy

Updating moltenVK and macOS icon

Amir Abravesh před 2 roky
rodič
revize
9895cc94d0

+ 4 - 1
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")

binární
dist/suyu.icns


+ 1 - 1
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)

+ 2 - 1
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 <algorithm>
@@ -162,6 +162,7 @@ constexpr VkBorderColor ConvertBorderColor(const std::array<float, 4>& color) {
     };
 }
 
+
 [[nodiscard]] vk::Image MakeImage(const Device& device, const MemoryAllocator& allocator,
                                   const ImageInfo& info, std::span<const VkFormat> view_formats) {
     const bool is_buffer = (info.type == ImageType::Buffer);