diff options
| -rw-r--r-- | CMakeModules/CopyYuzuFFmpegDeps.cmake | 2 | ||||
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/nfc.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/CMakeModules/CopyYuzuFFmpegDeps.cmake b/CMakeModules/CopyYuzuFFmpegDeps.cmake index 7aaa073ee..e50696cc0 100644 --- a/CMakeModules/CopyYuzuFFmpegDeps.cmake +++ b/CMakeModules/CopyYuzuFFmpegDeps.cmake @@ -6,5 +6,5 @@ function(copy_yuzu_FFmpeg_deps target_dir) set(DLL_DEST "$<TARGET_FILE_DIR:${target_dir}>/") file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS) string(STRIP "${FFmpeg_REQUIRED_DLLS}" FFmpeg_REQUIRED_DLLS) - windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) + windows_copy_files(${target_dir} ${FFmpeg_LIBRARY_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS}) endfunction(copy_yuzu_FFmpeg_deps) diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 3b7a628e5..f7058c4a7 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -528,9 +528,9 @@ NFCWritePackage NfcProtocol::MakeAmiiboWritePackage(const TagUUID& tag_uuid, } NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> data) const { - constexpr u8 PAGE_SIZE = 4; + constexpr u8 NFC_PAGE_SIZE = 4; - if (static_cast<std::size_t>(page * PAGE_SIZE) + size >= data.size()) { + if (static_cast<std::size_t>(page * NFC_PAGE_SIZE) + size >= data.size()) { return {}; } @@ -539,7 +539,7 @@ NFCDataChunk NfcProtocol::MakeAmiiboChunk(u8 page, u8 size, std::span<const u8> .data_size = size, .data = {}, }; - std::memcpy(chunk.data.data(), data.data() + (page * PAGE_SIZE), size); + std::memcpy(chunk.data.data(), data.data() + (page * NFC_PAGE_SIZE), size); return chunk; } diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index c336be707..427afd5fc 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h @@ -63,8 +63,12 @@ void BufferCache<P>::RunGarbageCollector() { template <class P> void BufferCache<P>::TickFrame() { - // Calculate hits and shots and move hit bits to the right + // Homebrew console apps don't create or bind any channels, so this will be nullptr. + if (!channel_state) { + return; + } + // Calculate hits and shots and move hit bits to the right const u32 hits = std::reduce(channel_state->uniform_cache_hits.begin(), channel_state->uniform_cache_hits.end()); const u32 shots = std::reduce(channel_state->uniform_cache_shots.begin(), |