ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc: Clang warning fixes

This commit is contained in:
Stenzek 2023-05-13 18:16:06 +10:00 committed by refractionpcsx2
parent 512d24cea6
commit ad0e469f87
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/Perf.cpp
View File

@ -181,10 +181,6 @@ namespace Perf
ml.method_size = static_cast<unsigned int>(size); ml.method_size = static_cast<unsigned int>(size);
iJIT_NotifyEvent(iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED_V2, &ml); iJIT_NotifyEvent(iJVM_EVENT_TYPE_METHOD_LOAD_FINISHED_V2, &ml);
} }
#else
static void RegisterMethod(const void* ptr, size_t size, const char* method)
{
}
#endif #endif
#if (defined(__linux__) && (defined(ProfileWithPerf) || defined(ProfileWithPerfJitDump))) || defined(ENABLE_VTUNE) #if (defined(__linux__) && (defined(ProfileWithPerf) || defined(ProfileWithPerfJitDump))) || defined(ENABLE_VTUNE)

4
pcsx2/GS/Renderers/Vulkan/GSTextureVK.cpp
View File

@ -80,8 +80,8 @@ std::unique_ptr<GSTextureVK> GSTextureVK::Create(Type type, Format format, int w
aci.requiredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; aci.requiredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
VkImageViewCreateInfo vci = {VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, nullptr, 0, VK_NULL_HANDLE, 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<u32>(levels), 0, VK_IMAGE_VIEW_TYPE_2D, vk_format, s_identity_swizzle,
1}; {VK_IMAGE_ASPECT_COLOR_BIT, 0, static_cast<u32>(levels), 0, 1}};
switch (type) switch (type)
{ {

2
pcsx2/ImGui/FullscreenUI.cpp
View File

@ -3049,8 +3049,6 @@ void FullscreenUI::DrawGraphicsSettingsPage()
"Nearest", "Bilinear (Forced)", "Bilinear (PS2)", "Bilinear (Forced excluding sprite)"}; "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_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_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[] = { static constexpr const char* s_blending_options[] = {
"Minimum", "Basic (Recommended)", "Medium", "High", "Full (Slow)", "Maximum (Very Slow)"}; "Minimum", "Basic (Recommended)", "Medium", "High", "Full (Slow)", "Maximum (Very Slow)"};
static constexpr const char* s_anisotropic_filtering_entries[] = {"Off (Default)", "2x", "4x", "8x", "16x"}; static constexpr const char* s_anisotropic_filtering_entries[] = {"Off (Default)", "2x", "4x", "8x", "16x"};

8
pcsx2/USB/usb-mic/usb-mic-singstar.cpp
View File

@ -378,13 +378,11 @@ namespace usb_mic
uint8_t cn = cscn - 1; /* -1 for the non-present master control */ uint8_t cn = cscn - 1; /* -1 for the non-present master control */
uint32_t aid = ATTRIB_ID(cs, attrib, idif); uint32_t aid = ATTRIB_ID(cs, attrib, idif);
int ret = USB_RET_STALL; int ret = USB_RET_STALL;
bool set_vol = false;
switch (aid) switch (aid)
{ {
case ATTRIB_ID(AUDIO_MUTE_CONTROL, AUDIO_REQUEST_SET_CUR, 0x0300): case ATTRIB_ID(AUDIO_MUTE_CONTROL, AUDIO_REQUEST_SET_CUR, 0x0300):
s->f.mute = data[0] & 1; s->f.mute = data[0] & 1;
set_vol = true;
ret = 0; ret = 0;
break; break;
case ATTRIB_ID(AUDIO_VOLUME_CONTROL, AUDIO_REQUEST_SET_CUR, 0x0300): case ATTRIB_ID(AUDIO_VOLUME_CONTROL, AUDIO_REQUEST_SET_CUR, 0x0300):
@ -396,15 +394,11 @@ namespace usb_mic
vol -= 0x8000; vol -= 0x8000;
vol = (vol * 255 + 0x4400) / 0x8800; vol = (vol * 255 + 0x4400) / 0x8800;
if (vol > 255) if (vol > 255)
{
vol = 255; vol = 255;
}
if (s->f.vol[cn] != vol) if (s->f.vol[cn] != vol)
{
s->f.vol[cn] = (uint8_t)vol; s->f.vol[cn] = (uint8_t)vol;
set_vol = true;
}
ret = 0; ret = 0;
} }
break; break;