From 5b5edc506da21b12bd968ced752b6e89bb06f337 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 10 Feb 2023 00:33:57 +1000 Subject: [PATCH] Misc: Warning fixes --- common/Vulkan/Context.h | 1 - pcsx2/GS/Renderers/HW/GSRendererHW.cpp | 2 +- pcsx2/R5900OpcodeImpl.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/Vulkan/Context.h b/common/Vulkan/Context.h index 450f12e8a5..c9348e616a 100644 --- a/common/Vulkan/Context.h +++ b/common/Vulkan/Context.h @@ -399,7 +399,6 @@ namespace Vulkan VkPhysicalDeviceProperties m_device_properties = {}; VkPhysicalDeviceMemoryProperties m_device_memory_properties = {}; VkPhysicalDeviceDriverPropertiesKHR m_device_driver_properties = {}; - VkPhysicalDeviceLineRasterizationFeaturesEXT m_line_rasterization_features = {}; OptionalExtensions m_optional_extensions = {}; }; diff --git a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp index 8ce9548674..e9acc6127d 100644 --- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp +++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp @@ -3142,7 +3142,7 @@ void GSRendererHW::EmulateTextureSampler(const GSTextureCache::Source* tex) const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[tex->m_TEX0.PSM]; const GSLocalMemory::psm_t& cpsm = psm.pal > 0 ? GSLocalMemory::m_psm[m_context->TEX0.CPSM] : psm; - static constexpr const char* clamp_modes[] = { "REPEAT", "CLAMP", "REGION_CLAMP", "REGION_REPEAT" }; + [[maybe_unused]] static constexpr const char* clamp_modes[] = { "REPEAT", "CLAMP", "REGION_CLAMP", "REGION_REPEAT" }; const bool redundant_wms = IsRedundantClamp(m_context->CLAMP.WMS, m_context->CLAMP.MINU, m_context->CLAMP.MAXU, tex->m_TEX0.TW); const bool redundant_wmt = IsRedundantClamp(m_context->CLAMP.WMT, m_context->CLAMP.MINV, m_context->CLAMP.MAXV, tex->m_TEX0.TH); const u8 wms = EffectiveClamp(m_context->CLAMP.WMS, tex->m_region.HasX()); diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp index 5c95a7e20b..5d14fb9060 100644 --- a/pcsx2/R5900OpcodeImpl.cpp +++ b/pcsx2/R5900OpcodeImpl.cpp @@ -519,7 +519,7 @@ void DSRLV(){ if (!_Rd_) return; cpuRegs.GPR.r[_Rd_].UD[0] = (u64)(cpuRegs.GPR.r // exceptions, since the lower bits of the address are used to determine the portions // of the address/register operations. -[[ noreturn ]] __noinline static void RaiseAddressError(u32 addr, bool store) +__noinline static void RaiseAddressError(u32 addr, bool store) { const std::string message(fmt::format("Address Error, addr=0x{:x} [{}]", addr, store ? "store" : "load"));