diff --git a/common/Perf.cpp b/common/Perf.cpp index 9246cbbaba..0740a4572a 100644 --- a/common/Perf.cpp +++ b/common/Perf.cpp @@ -181,10 +181,6 @@ namespace Perf ml.method_size = static_cast(size); iJIT_NotifyEvent(iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED_V2, &ml); } -#else - static void RegisterMethod(const void* ptr, size_t size, const char* method) - { - } #endif #if (defined(__linux__) && (defined(ProfileWithPerf) || defined(ProfileWithPerfJitDump))) || defined(ENABLE_VTUNE) diff --git a/pcsx2/GS/Renderers/Vulkan/GSTextureVK.cpp b/pcsx2/GS/Renderers/Vulkan/GSTextureVK.cpp index cfe9e6a59e..cb2ae0342e 100644 --- a/pcsx2/GS/Renderers/Vulkan/GSTextureVK.cpp +++ b/pcsx2/GS/Renderers/Vulkan/GSTextureVK.cpp @@ -80,8 +80,8 @@ std::unique_ptr GSTextureVK::Create(Type type, Format format, int w aci.requiredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; VkImageViewCreateInfo vci = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, nullptr, 0, VK_NULL_HANDLE, - VK_IMAGE_VIEW_TYPE_2D, vk_format, s_identity_swizzle, VK_IMAGE_ASPECT_COLOR_BIT, 0, static_cast(levels), 0, - 1}; + VK_IMAGE_VIEW_TYPE_2D, vk_format, s_identity_swizzle, + {VK_IMAGE_ASPECT_COLOR_BIT, 0, static_cast(levels), 0, 1}}; switch (type) { diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 0a8f85eee6..63bb2dbc61 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -3049,8 +3049,6 @@ void FullscreenUI::DrawGraphicsSettingsPage() "Nearest", "Bilinear (Forced)", "Bilinear (PS2)", "Bilinear (Forced excluding sprite)"}; static constexpr const char* s_trilinear_options[] = {"Automatic (Default)", "Off (None)", "Trilinear (PS2)", "Trilinear (Forced)"}; static constexpr const char* s_dithering_options[] = {"Off", "Scaled", "Unscaled (Default)"}; - static constexpr const char* s_crc_fix_options[] = { - "Automatic (Default)", "None (Debug)", "Minimum (Debug)", "Partial (OpenGL)", "Full (Direct3D)", "Aggressive"}; static constexpr const char* s_blending_options[] = { "Minimum", "Basic (Recommended)", "Medium", "High", "Full (Slow)", "Maximum (Very Slow)"}; static constexpr const char* s_anisotropic_filtering_entries[] = {"Off (Default)", "2x", "4x", "8x", "16x"}; diff --git a/pcsx2/USB/usb-mic/usb-mic-singstar.cpp b/pcsx2/USB/usb-mic/usb-mic-singstar.cpp index d42d2b144f..66885bd1b3 100644 --- a/pcsx2/USB/usb-mic/usb-mic-singstar.cpp +++ b/pcsx2/USB/usb-mic/usb-mic-singstar.cpp @@ -378,13 +378,11 @@ namespace usb_mic uint8_t cn = cscn - 1; /* -1 for the non-present master control */ uint32_t aid = ATTRIB_ID(cs, attrib, idif); int ret = USB_RET_STALL; - bool set_vol = false; switch (aid) { case ATTRIB_ID(AUDIO_MUTE_CONTROL, AUDIO_REQUEST_SET_CUR, 0x0300): s->f.mute = data[0] & 1; - set_vol = true; ret = 0; break; case ATTRIB_ID(AUDIO_VOLUME_CONTROL, AUDIO_REQUEST_SET_CUR, 0x0300): @@ -396,15 +394,11 @@ namespace usb_mic vol -= 0x8000; vol = (vol * 255 + 0x4400) / 0x8800; if (vol > 255) - { vol = 255; - } if (s->f.vol[cn] != vol) - { s->f.vol[cn] = (uint8_t)vol; - set_vol = true; - } + ret = 0; } break;