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

Misc: Fix various warnings

This commit is contained in:
Stenzek 2023-08-26 12:57:56 +10:00 committed by Connor McLaughlin
parent afdd63521f
commit 2ae44ca493
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/WrappedMemCopy.h
View File

@ -15,6 +15,7 @@
#include "common/Pcsx2Defs.h" #include "common/Pcsx2Defs.h"
[[maybe_unused]]
__ri static void MemCopy_WrappedDest(const u128* src, u128* destBase, uint& destStart, uint destSize, uint len) __ri static void MemCopy_WrappedDest(const u128* src, u128* destBase, uint& destStart, uint destSize, uint len)
{ {
uint endpos = destStart + len; uint endpos = destStart + len;
@ -32,6 +33,7 @@ __ri static void MemCopy_WrappedDest(const u128* src, u128* destBase, uint& dest
} }
} }
[[maybe_unused]]
__ri static void MemCopy_WrappedSrc(const u128* srcBase, uint& srcStart, uint srcSize, u128* dest, uint len) __ri static void MemCopy_WrappedSrc(const u128* srcBase, uint& srcStart, uint srcSize, u128* dest, uint len)
{ {
uint endpos = srcStart + len; uint endpos = srcStart + len;

2
pcsx2-qt/Settings/GameSummaryWidget.ui
View File

@ -34,7 +34,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<item> <item>
<widget class="QLineEdit" name="title"> <widget class="QLineEdit" name="title">
<property name="placeholderText"> <property name="placeholderText">

3
pcsx2/GS/Renderers/DX11/GSDevice11.cpp
View File

@ -159,11 +159,8 @@ bool GSDevice11::Create()
D3D11_RASTERIZER_DESC rd; D3D11_RASTERIZER_DESC rd;
D3D11_BLEND_DESC bsd; D3D11_BLEND_DESC bsd;
D3D_FEATURE_LEVEL level;
if (GSConfig.UseDebugDevice) if (GSConfig.UseDebugDevice)
m_annotation = m_ctx.try_query<ID3DUserDefinedAnnotation>(); m_annotation = m_ctx.try_query<ID3DUserDefinedAnnotation>();
level = m_dev->GetFeatureLevel();
if (!m_shader_cache.Open(m_dev->GetFeatureLevel(), GSConfig.UseDebugDevice)) if (!m_shader_cache.Open(m_dev->GetFeatureLevel(), GSConfig.UseDebugDevice))
Console.Warning("Shader cache failed to open."); Console.Warning("Shader cache failed to open.");

8
pcsx2/GS/Renderers/HW/GSRendererHW.cpp
View File

@ -5704,16 +5704,16 @@ bool GSRendererHW::DetectDoubleHalfClear(bool& no_rt, bool& no_ds)
// Have to check both contexts, because God of War 2 likes to do this in-between setting TRXDIR, which // Have to check both contexts, because God of War 2 likes to do this in-between setting TRXDIR, which
// causes a flush, and we don't have the next context backed up index set. // causes a flush, and we don't have the next context backed up index set.
bool horizontal = false; bool horizontal = false;
if ((m_env.CTXT[0].FRAME.FBW == m_cached_ctx.FRAME.FBW && if (((m_env.CTXT[0].FRAME.FBW == m_cached_ctx.FRAME.FBW &&
((m_env.CTXT[0].FRAME.FBP == base && ((m_env.CTXT[0].FRAME.FBP == base &&
(!m_env.CTXT[0].ZBUF.ZMSK || (m_env.CTXT[0].TEST.ZTE && m_env.CTXT[0].TEST.ZTST >= ZTST_GEQUAL)) && (!m_env.CTXT[0].ZBUF.ZMSK || (m_env.CTXT[0].TEST.ZTE && m_env.CTXT[0].TEST.ZTST >= ZTST_GEQUAL)) &&
m_env.CTXT[0].ZBUF.ZBP != half) || m_env.CTXT[0].ZBUF.ZBP != half) ||
(m_env.CTXT[0].ZBUF.ZBP == base && m_env.CTXT[0].FRAME.FBP != half))) || (m_env.CTXT[0].ZBUF.ZBP == base && m_env.CTXT[0].FRAME.FBP != half)))) ||
m_env.CTXT[1].FRAME.FBW == m_cached_ctx.FRAME.FBW && (m_env.CTXT[1].FRAME.FBW == m_cached_ctx.FRAME.FBW &&
((m_env.CTXT[1].FRAME.FBP == base && m_env.CTXT[1].ZBUF.ZBP != half) || ((m_env.CTXT[1].FRAME.FBP == base && m_env.CTXT[1].ZBUF.ZBP != half) ||
(m_env.CTXT[1].ZBUF.ZBP == base && (m_env.CTXT[1].ZBUF.ZBP == base &&
(!m_env.CTXT[1].ZBUF.ZMSK || (m_env.CTXT[1].TEST.ZTE && m_env.CTXT[1].TEST.ZTST >= ZTST_GEQUAL)) && (!m_env.CTXT[1].ZBUF.ZMSK || (m_env.CTXT[1].TEST.ZTE && m_env.CTXT[1].TEST.ZTST >= ZTST_GEQUAL)) &&
m_env.CTXT[1].FRAME.FBP != half))) m_env.CTXT[1].FRAME.FBP != half))))
{ {
// Needed for Spider-Man 2 (target was previously half size, double half cleared at new size). // Needed for Spider-Man 2 (target was previously half size, double half cleared at new size).
GL_INS("Confirmed double-half clear by next FBP/ZBP"); GL_INS("Confirmed double-half clear by next FBP/ZBP");

2
pcsx2/StateWrapper.cpp
View File

@ -18,6 +18,8 @@
#include <cinttypes> #include <cinttypes>
#include <cstring> #include <cstring>
StateWrapper::IStream::~IStream() = default;
StateWrapper::StateWrapper(IStream* stream, Mode mode, u32 version) StateWrapper::StateWrapper(IStream* stream, Mode mode, u32 version)
: m_stream(stream) : m_stream(stream)
, m_mode(mode) , m_mode(mode)

1
pcsx2/StateWrapper.h
View File

@ -38,6 +38,7 @@ public:
class IStream class IStream
{ {
public: public:
virtual ~IStream();
virtual u32 Read(void* buf, u32 count) = 0; virtual u32 Read(void* buf, u32 count) = 0;
virtual u32 Write(const void* buf, u32 count) = 0; virtual u32 Write(const void* buf, u32 count) = 0;
virtual u32 GetPosition() = 0; virtual u32 GetPosition() = 0;