From 0a3af2c776c447aa9c3288aced1a9c0b9f74b500 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Wed, 5 May 2021 19:25:34 +0200 Subject: [PATCH] early-access version 1656 --- README.md | 2 +- src/core/hle/kernel/k_page_table.cpp | 2 +- src/core/hle/kernel/k_page_table.h | 2 +- src/core/hle/service/am/applets/web_browser.h | 9 ++++----- src/core/hle/service/hid/controllers/gesture.cpp | 12 +++++------- src/core/hle/service/lbl/lbl.cpp | 1 - src/core/hle/service/pctl/module.cpp | 1 - 7 files changed, 12 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 009e6d621..c11c19a69 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1655. +This is the source code for early-access 1656. ## Legal Notice diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 6c5d7d602..d4ce98ee3 100755 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -1106,7 +1106,7 @@ constexpr std::size_t KPageTable::GetRegionSize(KMemoryState state) const { } } -constexpr bool KPageTable::CanContain(VAddr addr, std::size_t size, KMemoryState state) const { +bool KPageTable::CanContain(VAddr addr, std::size_t size, KMemoryState state) const { const VAddr end{addr + size}; const VAddr last{end - 1}; const VAddr region_start{GetRegionAddress(state)}; diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index baec7c260..8c2cc03eb 100755 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -64,7 +64,7 @@ public: return page_table_impl; } - constexpr bool CanContain(VAddr addr, std::size_t size, KMemoryState state) const; + bool CanContain(VAddr addr, std::size_t size, KMemoryState state) const; private: enum class OperationType : u32 { diff --git a/src/core/hle/service/am/applets/web_browser.h b/src/core/hle/service/am/applets/web_browser.h index 21fd910c2..1e1812f36 100755 --- a/src/core/hle/service/am/applets/web_browser.h +++ b/src/core/hle/service/am/applets/web_browser.h @@ -69,13 +69,12 @@ private: bool complete{false}; ResultCode status{RESULT_SUCCESS}; - WebAppletVersion web_applet_version; - WebExitReason web_exit_reason; - WebArgHeader web_arg_header; + WebAppletVersion web_applet_version{}; + WebArgHeader web_arg_header{}; WebArgInputTLVMap web_arg_input_tlv_map; - u64 title_id; - FileSys::ContentRecordType nca_type; + u64 title_id{}; + FileSys::ContentRecordType nca_type{}; std::string offline_cache_dir; std::string offline_document; FileSys::VirtualFile offline_romfs; diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index 03a291111..9e5df3bb7 100755 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp @@ -9,12 +9,6 @@ #include "core/frontend/emu_window.h" #include "core/hle/service/hid/controllers/gesture.h" -namespace { -constexpr inline f32 Square(s32 num) { - return static_cast(num * num); -} -} // Anonymous namespace - namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00; @@ -25,7 +19,11 @@ constexpr f32 pinch_threshold = 0.5f; // Threshold in pixels constexpr f32 press_delay = 0.5f; // Time in seconds constexpr f32 double_tap_delay = 0.35f; // Time in seconds -Controller_Gesture::Controller_Gesture(Core::System& system_) : ControllerBase{system_} {} +constexpr f32 Square(s32 num) { + return static_cast(num * num); +} + +Controller_Gesture::Controller_Gesture(Core::System& system) : ControllerBase(system) {} Controller_Gesture::~Controller_Gesture() = default; void Controller_Gesture::OnInit() { diff --git a/src/core/hle/service/lbl/lbl.cpp b/src/core/hle/service/lbl/lbl.cpp index e11a0c45a..3a5a2f4f5 100755 --- a/src/core/hle/service/lbl/lbl.cpp +++ b/src/core/hle/service/lbl/lbl.cpp @@ -312,7 +312,6 @@ private: bool vr_mode_enabled = false; float current_brightness = 1.0f; - float backlight_brightness = 1.0f; float ambient_light_value = 0.0f; float current_vr_brightness = 1.0f; bool dimming = true; diff --git a/src/core/hle/service/pctl/module.cpp b/src/core/hle/service/pctl/module.cpp index 55898f3dc..1c3d81143 100755 --- a/src/core/hle/service/pctl/module.cpp +++ b/src/core/hle/service/pctl/module.cpp @@ -361,7 +361,6 @@ private: States states{}; ParentalControlSettings settings{}; std::array pin_code{}; - bool can_use_stereo_vision = true; Capability capability{}; };