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

GS/HW: Compiler warning fixes

This commit is contained in:
Stenzek 2023-03-21 22:47:03 +10:00 committed by refractionpcsx2
parent 3346349bba
commit 87d269512e
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3668,8 +3668,6 @@ void GSRendererHW::EmulateTextureSampler(const GSTextureCache::Source* tex)
const float scale = tex->GetScale(); const float scale = tex->GetScale();
const GSVector2i unscaled_size = tex->GetUnscaledSize(); const GSVector2i unscaled_size = tex->GetUnscaledSize();
const int w = tex->m_texture->GetWidth();
const int h = tex->m_texture->GetHeight();
const int tw = static_cast<int>(1 << m_context->TEX0.TW); const int tw = static_cast<int>(1 << m_context->TEX0.TW);
const int th = static_cast<int>(1 << m_context->TEX0.TH); const int th = static_cast<int>(1 << m_context->TEX0.TH);

10
pcsx2/GS/Renderers/HW/GSTextureCache.cpp
View File

@ -213,11 +213,11 @@ GSVector4i GSTextureCache::TranslateAlignedRectByPage(u32 sbp, u32 spsm, u32 sbw
new_rect.w = in_rect.w; new_rect.w = in_rect.w;
} }
} }
else if (src_bw == rect_pages.width()) else if (static_cast<int>(src_bw) == rect_pages.width())
{ {
const u32 totalpages = rect_pages.width() * rect_pages.height(); const u32 totalpages = rect_pages.width() * rect_pages.height();
const bool full_rows = in_rect.width() == (src_bw * src_page_size.x); const bool full_rows = in_rect.width() == (static_cast<int>(src_bw) * src_page_size.x);
const bool single_row = in_rect.x == 0 && in_rect.y == 0 && totalpages <= dst_bw; const bool single_row = in_rect.x == 0 && in_rect.y == 0 && totalpages <= dst_bw;
bool uneven_pages = (horizontal_offset || (totalpages % dst_bw) != 0) && !single_row; bool uneven_pages = (horizontal_offset || (totalpages % dst_bw) != 0) && !single_row;
@ -356,11 +356,11 @@ void GSTextureCache::DirtyRectByPage(u32 sbp, u32 spsm, u32 sbw, Target* t, GSVe
new_rect.w = in_rect.w; new_rect.w = in_rect.w;
} }
} }
else if (src_bw == rect_pages.width()) else if (static_cast<int>(src_bw) == rect_pages.width())
{ {
const u32 totalpages = rect_pages.width() * rect_pages.height(); const u32 totalpages = rect_pages.width() * rect_pages.height();
const bool full_rows = in_rect.width() == (src_bw * src_page_size.x); const bool full_rows = in_rect.width() == (static_cast<int>(src_bw) * src_page_size.x);
const bool single_row = in_rect.x == 0 && in_rect.y == 0 && totalpages <= dst_bw; const bool single_row = in_rect.x == 0 && in_rect.y == 0 && totalpages <= dst_bw;
bool uneven_pages = (horizontal_offset || (totalpages % dst_bw) != 0) && !single_row; bool uneven_pages = (horizontal_offset || (totalpages % dst_bw) != 0) && !single_row;
@ -2112,8 +2112,6 @@ void GSTextureCache::InvalidateLocalMem(const GSOffset& off, const GSVector4i& r
r.z, r.z,
r.w); r.w);
const bool read_is_depth = (psm & 0x30) == 0x30;
// Could be reading Z24/32 back as CT32 (Gundam Battle Assault 3) // Could be reading Z24/32 back as CT32 (Gundam Battle Assault 3)
if (GSLocalMemory::m_psm[psm].bpp >= 16) if (GSLocalMemory::m_psm[psm].bpp >= 16)
{ {