diff options
| -rw-r--r-- | externals/cmake-modules/DetectArchitecture.cmake | 13 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 4 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu/Info.plist | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/externals/cmake-modules/DetectArchitecture.cmake b/externals/cmake-modules/DetectArchitecture.cmake index 105963c8c2..be84109994 100644 --- a/externals/cmake-modules/DetectArchitecture.cmake +++ b/externals/cmake-modules/DetectArchitecture.cmake @@ -36,12 +36,17 @@ This file is based off of Yuzu and Dynarmic. # should NOT be too dependent on the architecture # otherwise, you may end up with duplicate code if (CMAKE_OSX_ARCHITECTURES) - set(MULTIARCH_BUILD 1) + list(LENGTH CMAKE_OSX_ARCHITECTURES architecture_count) + if (architecture_count GREATER 1) + set(MULTIARCH_BUILD 1) + else() + set(MULTIARCH_BUILD 0) + endif() set(ARCHITECTURE "${CMAKE_OSX_ARCHITECTURES}") # hope and pray the architecture names match - foreach(ARCH IN ${CMAKE_OSX_ARCHITECTURES}) - set(ARCHITECTURE_${ARCH} 1 PARENT_SCOPE) + foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES) + set(ARCHITECTURE_${ARCH} 1) add_definitions(-DARCHITECTURE_${ARCH}=1) endforeach() @@ -218,4 +223,4 @@ if (NOT DEFINED ARCHITECTURE) add_definitions(-DARCHITECTURE_GENERIC=1) endif() -message(STATUS "[DetectArchitecture] Target architecture: ${ARCHITECTURE}")
\ No newline at end of file +message(STATUS "[DetectArchitecture] Target architecture: ${ARCHITECTURE}") diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index c8aaf8dff5..3b783fc6c6 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -3063,6 +3063,10 @@ template <class P> void TextureCache<P>::CopyImage(ImageId dst_id, ImageId src_id, std::vector<ImageCopy> copies) { Image& dst = slot_images[dst_id]; Image& src = slot_images[src_id]; + if (True(dst.flags & ImageFlagBits::UnwrittenSparse) || + True(src.flags & ImageFlagBits::UnwrittenSparse)) { + return; + } if (dst.info.astc_opaque != src.info.astc_opaque) { // BC1 and BC3 blocks differ in size, so the host can't copy between them; both hold the // same guest data, which is uploaded from guest memory instead. diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 40ff1d45f9..c9be4ff901 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -373,7 +373,7 @@ if (APPLE) XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED ON) # Otherwise, we'll use our own. else() - set(_icons "${_dist}/eglantine.icns" "${_dist}/Assets.car") + set(_icons "${_dist}/eden.icns" "${_dist}/Assets.car") endif() set_source_files_properties(${_icons} PROPERTIES diff --git a/src/yuzu/Info.plist b/src/yuzu/Info.plist index cf6f597e99..5c24f27f72 100644 --- a/src/yuzu/Info.plist +++ b/src/yuzu/Info.plist @@ -13,11 +13,11 @@ SPDX-License-Identifier: GPL-2.0-or-later <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> + <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string> <key>CFBundleGetInfoString</key> <string></string> <key>CFBundleIconFile</key> - <string>eglantine.icns</string> + <string>eden.icns</string> <key>CFBundleIconName</key> <string>eglantine</string> <key>CFBundleIdentifier</key> |