diff --git a/3rdparty/fmt/fmt b/3rdparty/fmt/fmt index 7bdf0628b1276..cd4af11efc9c6 160000 --- a/3rdparty/fmt/fmt +++ b/3rdparty/fmt/fmt @@ -1 +1 @@ -Subproject commit 7bdf0628b1276379886c7f6dda2cef2b3b374f0b +Subproject commit cd4af11efc9c622896a3e4cb599fa28668ca3d05 diff --git a/pcsx2/DEV9/Linux/Linux.cpp b/pcsx2/DEV9/Linux/Linux.cpp index ad78de9118b69..7ac7ae38b21c6 100644 --- a/pcsx2/DEV9/Linux/Linux.cpp +++ b/pcsx2/DEV9/Linux/Linux.cpp @@ -175,6 +175,7 @@ void OnOk() void DEV9configure() { +#ifndef __APPLE__ ScopedCoreThreadPause paused_core; Config oldConfig = config; @@ -213,4 +214,5 @@ void DEV9configure() ApplyConfigIfRunning(oldConfig); paused_core.AllowResume(); +#endif } diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp index 31c0018b63f5c..7d5bf79ad2edc 100644 --- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp +++ b/pcsx2/gui/Dialogs/GSDumpDialog.cpp @@ -43,6 +43,20 @@ #include #include +constexpr const char* Dialogs::GSDumpDialog::GSTransferPathNames[]; +constexpr const char* Dialogs::GSDumpDialog::GifFlagNames[]; +constexpr const char* Dialogs::GSDumpDialog::TEXTFXNames[]; +constexpr const char* Dialogs::GSDumpDialog::TEXTCCNames[]; +constexpr const char* Dialogs::GSDumpDialog::TEXPSMNames[]; +constexpr const char* Dialogs::GSDumpDialog::TEXCSMNames[]; +constexpr const char* Dialogs::GSDumpDialog::GsFSTNames[]; +constexpr const char* Dialogs::GSDumpDialog::GsCTXTNames[]; +constexpr const char* Dialogs::GSDumpDialog::TEXCPSMNames[]; +constexpr const char* Dialogs::GSDumpDialog::GSTypeNames[]; +constexpr const char* Dialogs::GSDumpDialog::GsPrimNames[]; +constexpr const char* Dialogs::GSDumpDialog::GsIIPNames[]; +constexpr const char* Dialogs::GSDumpDialog::GsFIXNames[]; + namespace GSDump { bool isRunning = false; diff --git a/plugins/GSdx/GSVector4i.h b/plugins/GSdx/GSVector4i.h index db376cdd57afe..980936b8f1728 100644 --- a/plugins/GSdx/GSVector4i.h +++ b/plugins/GSdx/GSVector4i.h @@ -113,10 +113,7 @@ class alignas(16) GSVector4i { } - __forceinline GSVector4i(const GSVector4i& v) - { - m = v.m; - } + __forceinline GSVector4i(const GSVector4i& v) = default; __forceinline explicit GSVector4i(const GSVector2i& v) {