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

GS-hw: Cleanup Half pixel offset Normal. 

Now that custom res is removed, we don't need to split modx and mody.

Also purely rely on the tc to handle the HPO hack.
This commit is contained in:
lightningterror 2022-04-26 19:09:56 +02:00
parent e96545ca29
commit 6345e8e467
4 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/GS/Renderers/Common/GSTexture.cpp
View File

@ -31,9 +31,7 @@ GSTexture::GSTexture()
, m_sparse(false) , m_sparse(false)
, m_needs_mipmaps_generated(true) , m_needs_mipmaps_generated(true)
, last_frame_used(0) , last_frame_used(0)
, LikelyOffset(false) , OffsetHack_modxy(0.0f)
, OffsetHack_modx(0.0f)
, OffsetHack_mody(0.0f)
{ {
} }
@ -83,9 +81,7 @@ void GSTexture::Swap(GSTexture* tex)
std::swap(m_sparse, tex->m_sparse); std::swap(m_sparse, tex->m_sparse);
std::swap(m_needs_mipmaps_generated, tex->m_needs_mipmaps_generated); std::swap(m_needs_mipmaps_generated, tex->m_needs_mipmaps_generated);
std::swap(last_frame_used, tex->last_frame_used); std::swap(last_frame_used, tex->last_frame_used);
std::swap(LikelyOffset, tex->LikelyOffset); std::swap(OffsetHack_modxy, tex->OffsetHack_modxy);
std::swap(OffsetHack_modx, tex->OffsetHack_modx);
std::swap(OffsetHack_mody, tex->OffsetHack_mody);
} }
u32 GSTexture::GetCompressedBytesPerBlock() const u32 GSTexture::GetCompressedBytesPerBlock() const

4
pcsx2/GS/Renderers/Common/GSTexture.h
View File

@ -143,9 +143,7 @@ public:
// different purpose than texture cache ages, do not attempt to merge // different purpose than texture cache ages, do not attempt to merge
unsigned last_frame_used; unsigned last_frame_used;
bool LikelyOffset; float OffsetHack_modxy;
float OffsetHack_modx;
float OffsetHack_mody;
// Typical size of a RGBA texture // Typical size of a RGBA texture
virtual u32 GetMemUsage() { return m_size.x * m_size.y * (m_format == Format::UNorm8 ? 1 : 4); } virtual u32 GetMemUsage() { return m_size.x * m_size.y * (m_format == Format::UNorm8 ? 1 : 4); }

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

@ -3338,10 +3338,10 @@ void GSRendererHW::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sourc
//The resulting shifted output aligns better with common blending / corona / blurring effects, //The resulting shifted output aligns better with common blending / corona / blurring effects,
//but introduces a few bad pixels on the edges. //but introduces a few bad pixels on the edges.
if (rt && rt->LikelyOffset && GSConfig.UserHacks_HalfPixelOffset == 1) if (rt && rt->OffsetHack_modxy > 1.0f)
{ {
ox2 *= rt->OffsetHack_modx; ox2 *= rt->OffsetHack_modxy;
oy2 *= rt->OffsetHack_mody; oy2 *= rt->OffsetHack_modxy;
} }
m_conf.cb_vs.vertex_scale = GSVector2(sx, sy); m_conf.cb_vs.vertex_scale = GSVector2(sx, sy);

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

@ -1419,27 +1419,21 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
// Offset hack. Can be enabled via GS options. // Offset hack. Can be enabled via GS options.
// The offset will be used in Draw(). // The offset will be used in Draw().
float modxy = 0.0f;
float modx = 0.0f;
float mody = 0.0f;
if (GSConfig.UserHacks_HalfPixelOffset == 1 && hack) if (GSConfig.UserHacks_HalfPixelOffset == 1 && hack)
{ {
modxy = static_cast<float>(g_gs_renderer->GetUpscaleMultiplier());
switch (g_gs_renderer->GetUpscaleMultiplier()) switch (g_gs_renderer->GetUpscaleMultiplier())
{ {
case 2: modx = 2.2f; mody = 2.2f; dst->m_texture->LikelyOffset = true; break; case 2: case 4: case 6: case 8: modxy += 0.2f; break;
case 3: modx = 3.1f; mody = 3.1f; dst->m_texture->LikelyOffset = true; break; case 3: case 7: modxy += 0.1f; break;
case 4: modx = 4.2f; mody = 4.2f; dst->m_texture->LikelyOffset = true; break; case 5: modxy += 0.3f; break;
case 5: modx = 5.3f; mody = 5.3f; dst->m_texture->LikelyOffset = true; break; default: modxy = 0.0f; break;
case 6: modx = 6.2f; mody = 6.2f; dst->m_texture->LikelyOffset = true; break;
case 7: modx = 7.1f; mody = 7.1f; dst->m_texture->LikelyOffset = true; break;
case 8: modx = 8.2f; mody = 8.2f; dst->m_texture->LikelyOffset = true; break;
default: modx = 0.0f; mody = 0.0f; dst->m_texture->LikelyOffset = false; break;
} }
} }
dst->m_texture->OffsetHack_modx = modx; dst->m_texture->OffsetHack_modxy = modxy;
dst->m_texture->OffsetHack_mody = mody;
} }
else else
{ {