From cc3c4e63894122128d2fb64f259e6c85beb7e8ce Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Sat, 19 Feb 2022 02:07:06 +0100 Subject: [PATCH] early-access version 2498 --- README.md | 2 +- src/common/telemetry.h | 3 +++ src/video_core/vulkan_common/vulkan_device.cpp | 10 ++++++++++ src/yuzu/configuration/configure_input_player.cpp | 3 +++ src/yuzu/configuration/configure_touch_from_button.cpp | 3 +++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8121bb2b2..c4da0fbd1 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2496. +This is the source code for early-access 2498. ## Legal Notice diff --git a/src/common/telemetry.h b/src/common/telemetry.h index d38aeac99..4d632f7eb 100755 --- a/src/common/telemetry.h +++ b/src/common/telemetry.h @@ -171,6 +171,9 @@ struct VisitorInterface { struct NullVisitor final : public VisitorInterface { YUZU_NON_COPYABLE(NullVisitor); + NullVisitor() = default; + ~NullVisitor() override = default; + void Visit(const Field& /*field*/) override {} void Visit(const Field& /*field*/) override {} void Visit(const Field& /*field*/) override {} diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 26f182fa7..0c8516b33 100755 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -41,6 +41,14 @@ constexpr std::array DEPTH16_UNORM_STENCIL8_UINT{ VK_FORMAT_D32_SFLOAT_S8_UINT, VK_FORMAT_UNDEFINED, }; + +constexpr std::array B5G6R5_UNORM_PACK16{ + VK_FORMAT_R5G6B5_UNORM_PACK16, + VK_FORMAT_R5G5B5A1_UNORM_PACK16, + VK_FORMAT_A1R5G5B5_UNORM_PACK16, + VK_FORMAT_R4G4B4A4_UNORM_PACK16, + VK_FORMAT_UNDEFINED, +}; } // namespace Alternatives enum class NvidiaArchitecture { @@ -89,6 +97,8 @@ constexpr const VkFormat* GetFormatAlternatives(VkFormat format) { return Alternatives::DEPTH24_UNORM_STENCIL8_UINT.data(); case VK_FORMAT_D16_UNORM_S8_UINT: return Alternatives::DEPTH16_UNORM_STENCIL8_UINT.data(); + case VK_FORMAT_B5G6R5_UNORM_PACK16: + return Alternatives::B5G6R5_UNORM_PACK16.data(); default: return nullptr; } diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index ce8152a86..12e016e3a 100755 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp @@ -1332,6 +1332,9 @@ void ConfigureInputPlayer::HandleClick( QPushButton* button, std::size_t button_id, std::function new_input_setter, InputCommon::Polling::InputType type) { + if (timeout_timer->isActive()) { + return; + } if (button == ui->buttonMotionLeft || button == ui->buttonMotionRight) { button->setText(tr("Shake!")); } else { diff --git a/src/yuzu/configuration/configure_touch_from_button.cpp b/src/yuzu/configuration/configure_touch_from_button.cpp index bde0a08c4..211a00217 100755 --- a/src/yuzu/configuration/configure_touch_from_button.cpp +++ b/src/yuzu/configuration/configure_touch_from_button.cpp @@ -227,6 +227,9 @@ void ConfigureTouchFromButton::RenameMapping() { } void ConfigureTouchFromButton::GetButtonInput(const int row_index, const bool is_new) { + if (timeout_timer->isActive()) { + return; + } binding_list_model->item(row_index, 0)->setText(tr("[press key]")); input_setter = [this, row_index, is_new](const Common::ParamPackage& params,