summaryrefslogtreecommitdiff
path: root/src/input_common/drivers
diff options
context:
space:
mode:
authorGravatar liamwhite2023-02-15 17:42:38 -0500
committerGravatar GitHub2023-02-15 17:42:38 -0500
commit04d2d2ef5fdd56baa0ecf60e59ea4e915262161d (patch)
tree3951ff8988fff573acd7f2b4edf5d95774b3721d /src/input_common/drivers
parentMerge pull request #9809 from liamwhite/unused-service (diff)
parentremove constexpr from virtual function (diff)
downloadyuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.gz
yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.tar.xz
yuzu-04d2d2ef5fdd56baa0ecf60e59ea4e915262161d.zip
Merge pull request #9782 from arades79/fix-consexpr-value-declaration-usage
Fix consexpr value declaration usage
Diffstat (limited to '')
-rw-r--r--src/input_common/drivers/joycon.cpp2
-rw-r--r--src/input_common/drivers/sdl_driver.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/drivers/joycon.cpp b/src/input_common/drivers/joycon.cpp
index afc33db57..b4cd39a20 100644
--- a/src/input_common/drivers/joycon.cpp
+++ b/src/input_common/drivers/joycon.cpp
@@ -390,7 +390,7 @@ void Joycons::OnMotionUpdate(std::size_t port, Joycon::ControllerType type, int
390void Joycons::OnRingConUpdate(f32 ring_data) { 390void Joycons::OnRingConUpdate(f32 ring_data) {
391 // To simplify ring detection it will always be mapped to an empty identifier for all 391 // To simplify ring detection it will always be mapped to an empty identifier for all
392 // controllers 392 // controllers
393 constexpr PadIdentifier identifier = { 393 static constexpr PadIdentifier identifier = {
394 .guid = Common::UUID{}, 394 .guid = Common::UUID{},
395 .port = 0, 395 .port = 0,
396 .pad = 0, 396 .pad = 0,
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 88cacd615..5c20b3426 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -616,7 +616,7 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) {
616 const auto joystick = 616 const auto joystick =
617 GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast<int>(identifier.port)); 617 GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast<int>(identifier.port));
618 618
619 constexpr Common::Input::VibrationStatus test_vibration{ 619 static constexpr Common::Input::VibrationStatus test_vibration{
620 .low_amplitude = 1, 620 .low_amplitude = 1,
621 .low_frequency = 160.0f, 621 .low_frequency = 160.0f,
622 .high_amplitude = 1, 622 .high_amplitude = 1,
@@ -624,7 +624,7 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) {
624 .type = Common::Input::VibrationAmplificationType::Exponential, 624 .type = Common::Input::VibrationAmplificationType::Exponential,
625 }; 625 };
626 626
627 constexpr Common::Input::VibrationStatus zero_vibration{ 627 static constexpr Common::Input::VibrationStatus zero_vibration{
628 .low_amplitude = 0, 628 .low_amplitude = 0,
629 .low_frequency = 160.0f, 629 .low_frequency = 160.0f,
630 .high_amplitude = 0, 630 .high_amplitude = 0,