From 0a02d001b36d2afc40970fe02d7160f02edcc3df Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 25 Jul 2023 21:18:55 +0200 Subject: [PATCH] early-access version 3778 --- CMakeLists.txt | 16 ++++++++++++++++ README.md | 2 +- src/common/settings.h | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b66a38d54..9c2878d42 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,22 @@ if (YUZU_USE_BUNDLED_VCPKG) endif() endif() + if (MSVC) + set(VCPKG_DOWNLOADS_PATH ${PROJECT_SOURCE_DIR}/externals/vcpkg/downloads) + set(NASM_VERSION "2.16.01") + set(NASM_DESTINATION_PATH ${VCPKG_DOWNLOADS_PATH}/nasm-${NASM_VERSION}-win64.zip) + set(NASM_DOWNLOAD_URL "https://github.com/yuzu-emu/ext-windows-bin/raw/master/nasm/nasm-${NASM_VERSION}-win64.zip") + + if (NOT EXISTS ${NASM_DESTINATION_PATH}) + file(DOWNLOAD ${NASM_DOWNLOAD_URL} ${NASM_DESTINATION_PATH} SHOW_PROGRESS STATUS NASM_STATUS) + + if (NOT NASM_STATUS EQUAL 0) + # Warn and not fail since vcpkg is supposed to download this package for us in the first place + message(WARNING "External nasm vcpkg package download from ${NASM_DOWNLOAD_URL} failed with status ${NASM_STATUS}") + endif() + endif() + endif() + if (YUZU_TESTS) list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests") endif() diff --git a/README.md b/README.md index f2d6af7f4..8c4fc39f3 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3777. +This is the source code for early-access 3778. ## Legal Notice diff --git a/src/common/settings.h b/src/common/settings.h index afe77db77..5d3cb7605 100755 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -226,7 +226,7 @@ struct Values { SwitchableSetting use_asynchronous_gpu_emulation{ linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer}; SwitchableSetting accelerate_astc{linkage, - AstcDecodeMode::Cpu, + AstcDecodeMode::Gpu, AstcDecodeMode::Cpu, AstcDecodeMode::CpuAsynchronous, "accelerate_astc",