diff options
| -rw-r--r-- | src/common/virtual_buffer.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_adapter.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/gcadapter/gc_poller.cpp | 6 | ||||
| -rw-r--r-- | src/input_common/udp/client.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_debug.ui | 22 |
5 files changed, 5 insertions, 28 deletions
diff --git a/src/common/virtual_buffer.cpp b/src/common/virtual_buffer.cpp index b426f4747..be5b67752 100644 --- a/src/common/virtual_buffer.cpp +++ b/src/common/virtual_buffer.cpp | |||
| @@ -38,7 +38,7 @@ void* AllocateMemoryPages(std::size_t size) { | |||
| 38 | return base; | 38 | return base; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | void FreeMemoryPages(void* base, std::size_t size) { | 41 | void FreeMemoryPages(void* base, [[maybe_unused]] std::size_t size) { |
| 42 | if (!base) { | 42 | if (!base) { |
| 43 | return; | 43 | return; |
| 44 | } | 44 | } |
diff --git a/src/input_common/gcadapter/gc_adapter.cpp b/src/input_common/gcadapter/gc_adapter.cpp index 02d06876f..29ea1f2c7 100644 --- a/src/input_common/gcadapter/gc_adapter.cpp +++ b/src/input_common/gcadapter/gc_adapter.cpp | |||
| @@ -254,7 +254,7 @@ void Adapter::GetGCEndpoint(libusb_device* device) { | |||
| 254 | sizeof(clear_payload), nullptr, 16); | 254 | sizeof(clear_payload), nullptr, 16); |
| 255 | 255 | ||
| 256 | adapter_thread_running = true; | 256 | adapter_thread_running = true; |
| 257 | adapter_input_thread = std::thread([=] { Read(); }); // Read input | 257 | adapter_input_thread = std::thread(&Adapter::Read, this); |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | Adapter::~Adapter() { | 260 | Adapter::~Adapter() { |
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 96e22d3ad..f45983f3f 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp | |||
| @@ -76,8 +76,7 @@ std::unique_ptr<Input::ButtonDevice> GCButtonFactory::Create(const Common::Param | |||
| 76 | 76 | ||
| 77 | // button is not an axis/stick button | 77 | // button is not an axis/stick button |
| 78 | if (button_id != PAD_STICK_ID) { | 78 | if (button_id != PAD_STICK_ID) { |
| 79 | auto button = std::make_unique<GCButton>(port, button_id, adapter.get()); | 79 | return std::make_unique<GCButton>(port, button_id, adapter.get()); |
| 80 | return std::move(button); | ||
| 81 | } | 80 | } |
| 82 | 81 | ||
| 83 | // For Axis buttons, used by the binary sticks. | 82 | // For Axis buttons, used by the binary sticks. |
| @@ -264,7 +263,8 @@ Common::ParamPackage GCAnalogFactory::GetNextInput() { | |||
| 264 | if (analog_x_axis == -1) { | 263 | if (analog_x_axis == -1) { |
| 265 | analog_x_axis = axis; | 264 | analog_x_axis = axis; |
| 266 | controller_number = static_cast<int>(port); | 265 | controller_number = static_cast<int>(port); |
| 267 | } else if (analog_y_axis == -1 && analog_x_axis != axis && controller_number == port) { | 266 | } else if (analog_y_axis == -1 && analog_x_axis != axis && |
| 267 | controller_number == static_cast<int>(port)) { | ||
| 268 | analog_y_axis = axis; | 268 | analog_y_axis = axis; |
| 269 | } | 269 | } |
| 270 | } | 270 | } |
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp index e63c73c4f..6c95a8b42 100644 --- a/src/input_common/udp/client.cpp +++ b/src/input_common/udp/client.cpp | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <functional> | 9 | #include <functional> |
| 10 | #include <thread> | 10 | #include <thread> |
| 11 | #include <boost/asio.hpp> | 11 | #include <boost/asio.hpp> |
| 12 | #include <boost/bind.hpp> | ||
| 13 | #include "common/logging/log.h" | 12 | #include "common/logging/log.h" |
| 14 | #include "input_common/udp/client.h" | 13 | #include "input_common/udp/client.h" |
| 15 | #include "input_common/udp/protocol.h" | 14 | #include "input_common/udp/protocol.h" |
diff --git a/src/yuzu/configuration/configure_debug.ui b/src/yuzu/configuration/configure_debug.ui index 272bdd6b8..9d6feb9f7 100644 --- a/src/yuzu/configuration/configure_debug.ui +++ b/src/yuzu/configuration/configure_debug.ui | |||
| @@ -171,26 +171,6 @@ | |||
| 171 | </property> | 171 | </property> |
| 172 | <layout class="QVBoxLayout" name="verticalLayout_6"> | 172 | <layout class="QVBoxLayout" name="verticalLayout_6"> |
| 173 | <item> | 173 | <item> |
| 174 | <widget class="QCheckBox" name="dump_decompressed_nso"> | ||
| 175 | <property name="whatsThis"> | ||
| 176 | <string>When checked, any NSO yuzu tries to load or patch will be copied decompressed to the yuzu/dump directory.</string> | ||
| 177 | </property> | ||
| 178 | <property name="text"> | ||
| 179 | <string>Dump Decompressed NSOs</string> | ||
| 180 | </property> | ||
| 181 | </widget> | ||
| 182 | </item> | ||
| 183 | <item> | ||
| 184 | <widget class="QCheckBox" name="dump_exefs"> | ||
| 185 | <property name="whatsThis"> | ||
| 186 | <string>When checked, any game that yuzu loads will have its ExeFS dumped to the yuzu/dump directory.</string> | ||
| 187 | </property> | ||
| 188 | <property name="text"> | ||
| 189 | <string>Dump ExeFS</string> | ||
| 190 | </property> | ||
| 191 | </widget> | ||
| 192 | </item> | ||
| 193 | <item> | ||
| 194 | <widget class="QCheckBox" name="reporting_services"> | 174 | <widget class="QCheckBox" name="reporting_services"> |
| 195 | <property name="text"> | 175 | <property name="text"> |
| 196 | <string>Enable Verbose Reporting Services</string> | 176 | <string>Enable Verbose Reporting Services</string> |
| @@ -257,8 +237,6 @@ | |||
| 257 | <tabstop>open_log_button</tabstop> | 237 | <tabstop>open_log_button</tabstop> |
| 258 | <tabstop>homebrew_args_edit</tabstop> | 238 | <tabstop>homebrew_args_edit</tabstop> |
| 259 | <tabstop>enable_graphics_debugging</tabstop> | 239 | <tabstop>enable_graphics_debugging</tabstop> |
| 260 | <tabstop>dump_decompressed_nso</tabstop> | ||
| 261 | <tabstop>dump_exefs</tabstop> | ||
| 262 | <tabstop>reporting_services</tabstop> | 240 | <tabstop>reporting_services</tabstop> |
| 263 | <tabstop>quest_flag</tabstop> | 241 | <tabstop>quest_flag</tabstop> |
| 264 | </tabstops> | 242 | </tabstops> |