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

GS: fully support target rescaling in TC. 

Also avoid redundant clears when the target
is going to be completely drawn when rescaling.
This commit is contained in:
iMineLink 2022-01-08 19:07:32 +01:00 committed by refractionpcsx2
parent b5a78763f8
commit 2a2564cf45
2 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,12 +495,6 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, con
return src; return src;
} }
void GSTextureCache::ScaleTexture(GSTexture* texture)
{
if (texture)
texture->SetScale(m_renderer->GetTextureScaleFactor());
}
bool GSTextureCache::ShallSearchTextureInsideRt() bool GSTextureCache::ShallSearchTextureInsideRt()
{ {
return m_texture_inside_rt || (m_renderer->m_game.flags & CRC::Flags::TextureInsideRt); return m_texture_inside_rt || (m_renderer->m_game.flags & CRC::Flags::TextureInsideRt);
@ -509,9 +503,25 @@ bool GSTextureCache::ShallSearchTextureInsideRt()
GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int w, int h, int type, bool used, u32 fbmask) GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int w, int h, int type, bool used, u32 fbmask)
{ {
const GSLocalMemory::psm_t& psm_s = GSLocalMemory::m_psm[TEX0.PSM]; const GSLocalMemory::psm_t& psm_s = GSLocalMemory::m_psm[TEX0.PSM];
u32 bp = TEX0.TBP0; const GSVector2& new_s = m_renderer->GetTextureScaleFactor();
const u32 bp = TEX0.TBP0;
float res_w = 0, res_h = 0;
int new_w = 0, new_h = 0;
bool clear = true;
const auto& calcRescale = [w, h, new_s, &res_w, &res_h, &new_w, &new_h, &clear](const GSTexture* tex)
{
const GSVector2& old_s = tex->GetScale();
const GSVector2 ratio{ new_s.x / old_s.x, new_s.y / old_s.y };
const int old_w = tex->GetWidth();
const int old_h = tex->GetHeight();
res_w = static_cast<float>(old_w) * ratio.x;
res_h = static_cast<float>(old_h) * ratio.y;
new_w = std::max(static_cast<int>(std::ceil(res_w)), w);
new_h = std::max(static_cast<int>(std::ceil(res_h)), h);
clear = new_w != res_w || new_h != res_h;
};
Target* dst = NULL; Target* dst = nullptr;
auto& list = m_dst[type]; auto& list = m_dst[type];
for (auto i = list.begin(); i != list.end(); ++i) for (auto i = list.begin(); i != list.end(); ++i)
@ -535,6 +545,19 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
{ {
GL_CACHE("TC: Lookup Target(%s) %dx%d, hit: %d (0x%x, %s)", to_string(type), w, h, dst->m_texture->GetID(), bp, psm_str(TEX0.PSM)); GL_CACHE("TC: Lookup Target(%s) %dx%d, hit: %d (0x%x, %s)", to_string(type), w, h, dst->m_texture->GetID(), bp, psm_str(TEX0.PSM));
const GSVector2& old_s = dst->m_texture->GetScale();
if (new_s != old_s)
{
calcRescale(dst->m_texture);
const GSVector4 sRect(0, 0, 1, 1);
const GSVector4 dRect(0.0f, 0.0f, res_w, res_h);
GSTexture* tex = type == RenderTarget ? g_gs_device->CreateSparseRenderTarget(new_w, new_h, GSTexture::Format::Color, clear) :
g_gs_device->CreateSparseDepthStencil(new_w, new_h, GSTexture::Format::DepthStencil, clear);
g_gs_device->StretchRect(dst->m_texture, sRect, tex, dRect, ShaderConvert::COPY, false);
g_gs_device->Recycle(dst->m_texture);
dst->m_texture = tex;
}
dst->Update(); dst->Update();
dst->m_dirty_alpha |= (psm_s.trbpp == 32 && (fbmask & 0xFF000000) != 0xFF000000) || (psm_s.trbpp == 16); dst->m_dirty_alpha |= (psm_s.trbpp == 32 && (fbmask & 0xFF000000) != 0xFF000000) || (psm_s.trbpp == 16);
@ -565,19 +588,11 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
if (dst_match) if (dst_match)
{ {
const GSVector2& new_s = m_renderer->GetTextureScaleFactor(); calcRescale(dst_match->m_texture);
const GSVector2& old_s = dst_match->m_texture->GetScale();
const GSVector2 ratio{ new_s.x / old_s.x, new_s.y / old_s.y };
const int old_w = dst_match->m_texture->GetWidth();
const int old_h = dst_match->m_texture->GetHeight();
const float res_w = static_cast<float>(old_w) * ratio.x;
const float res_h = static_cast<float>(old_h) * ratio.y;
const int new_w = std::max(static_cast<int>(std::ceil(res_w)), w);
const int new_h = std::max(static_cast<int>(std::ceil(res_h)), h);
const GSVector4 sRect(0, 0, 1, 1); const GSVector4 sRect(0, 0, 1, 1);
const GSVector4 dRect(0.0f, 0.0f, res_w, res_h); const GSVector4 dRect(0.0f, 0.0f, res_w, res_h);
dst = CreateTarget(TEX0, new_w, new_h, type); dst = CreateTarget(TEX0, new_w, new_h, type, clear);
dst->m_32_bits_fmt = dst_match->m_32_bits_fmt; dst->m_32_bits_fmt = dst_match->m_32_bits_fmt;
ShaderConvert shader; ShaderConvert shader;
@ -596,11 +611,11 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
} }
} }
if (dst == NULL) if (!dst)
{ {
GL_CACHE("TC: Lookup Target(%s) %dx%d, miss (0x%x, %s)", to_string(type), w, h, bp, psm_str(TEX0.PSM)); GL_CACHE("TC: Lookup Target(%s) %dx%d, miss (0x%x, %s)", to_string(type), w, h, bp, psm_str(TEX0.PSM));
dst = CreateTarget(TEX0, w, h, type); dst = CreateTarget(TEX0, w, h, type, true);
// In theory new textures contain invalidated data. Still in theory a new target // In theory new textures contain invalidated data. Still in theory a new target
// must contains the content of the GS memory. // must contains the content of the GS memory.
@ -628,7 +643,6 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
dst->Update(); dst->Update();
} }
} }
ScaleTexture(dst->m_texture);
if (used) if (used)
{ {
dst->m_used = true; dst->m_used = true;
@ -724,8 +738,7 @@ GSTextureCache::Target* GSTextureCache::LookupTarget(const GIFRegTEX0& TEX0, int
{ {
GL_CACHE("TC: Lookup Frame %dx%d, miss (0x%x %s)", w, h, bp, psm_str(TEX0.PSM)); GL_CACHE("TC: Lookup Frame %dx%d, miss (0x%x %s)", w, h, bp, psm_str(TEX0.PSM));
dst = CreateTarget(TEX0, w, h, RenderTarget); dst = CreateTarget(TEX0, w, h, RenderTarget, true);
ScaleTexture(dst->m_texture);
if (m_preload_frame) if (m_preload_frame)
{ {
@ -1632,27 +1645,27 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
return src; return src;
} }
GSTextureCache::Target* GSTextureCache::CreateTarget(const GIFRegTEX0& TEX0, int w, int h, int type) GSTextureCache::Target* GSTextureCache::CreateTarget(const GIFRegTEX0& TEX0, int w, int h, int type, const bool clear)
{ {
ASSERT(type == RenderTarget || type == DepthStencil); ASSERT(type == RenderTarget || type == DepthStencil);
Target* t = new Target(m_renderer, TEX0, m_temp, m_can_convert_depth); Target* t = new Target(m_renderer, TEX0, m_temp, m_can_convert_depth, type);
// FIXME: initial data should be unswizzled from local mem in Update() if dirty // FIXME: initial data should be unswizzled from local mem in Update() if dirty
t->m_type = type;
if (type == RenderTarget) if (type == RenderTarget)
{ {
t->m_texture = g_gs_device->CreateSparseRenderTarget(w, h, GSTexture::Format::Color); t->m_texture = g_gs_device->CreateSparseRenderTarget(w, h, GSTexture::Format::Color, clear);
t->m_used = true; // FIXME t->m_used = true; // FIXME
} }
else if (type == DepthStencil) else if (type == DepthStencil)
{ {
t->m_texture = g_gs_device->CreateSparseDepthStencil(w, h, GSTexture::Format::DepthStencil); t->m_texture = g_gs_device->CreateSparseDepthStencil(w, h, GSTexture::Format::DepthStencil, clear);
} }
t->m_texture->SetScale(m_renderer->GetTextureScaleFactor());
m_dst[type].push_front(t); m_dst[type].push_front(t);
return t; return t;
@ -2260,9 +2273,9 @@ bool GSTextureCache::Source::ClutMatch(const PaletteKey& palette_key)
// GSTextureCache::Target // GSTextureCache::Target
GSTextureCache::Target::Target(GSRenderer* r, const GIFRegTEX0& TEX0, u8* temp, bool depth_supported) GSTextureCache::Target::Target(GSRenderer* r, const GIFRegTEX0& TEX0, u8* temp, const bool depth_supported, const int type)
: Surface(r, temp) : Surface(r, temp)
, m_type(-1) , m_type(type)
, m_used(false) , m_used(false)
, m_depth_supported(depth_supported) , m_depth_supported(depth_supported)
{ {

9
pcsx2/GS/Renderers/HW/GSTextureCache.h
View File

@ -152,15 +152,15 @@ public:
class Target : public Surface class Target : public Surface
{ {
public: public:
int m_type; const int m_type;
bool m_used; bool m_used;
GSDirtyRectList m_dirty; GSDirtyRectList m_dirty;
GSVector4i m_valid; GSVector4i m_valid;
bool m_depth_supported; const bool m_depth_supported;
bool m_dirty_alpha; bool m_dirty_alpha;
public: public:
Target(GSRenderer* r, const GIFRegTEX0& TEX0, u8* temp, bool depth_supported); Target(GSRenderer* r, const GIFRegTEX0& TEX0, u8* temp, const bool depth_supported, const int type);
void UpdateValidity(const GSVector4i& rect); void UpdateValidity(const GSVector4i& rect);
@ -236,7 +236,7 @@ protected:
std::vector<TexInsideRtCacheEntry> m_texture_inside_rt_cache; std::vector<TexInsideRtCacheEntry> m_texture_inside_rt_cache;
Source* CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* t = NULL, bool half_right = false, int x_offset = 0, int y_offset = 0, bool mipmap = false); Source* CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* t = NULL, bool half_right = false, int x_offset = 0, int y_offset = 0, bool mipmap = false);
Target* CreateTarget(const GIFRegTEX0& TEX0, int w, int h, int type); Target* CreateTarget(const GIFRegTEX0& TEX0, int w, int h, int type, const bool clear);
// TODO: virtual void Write(Source* s, const GSVector4i& r) = 0; // TODO: virtual void Write(Source* s, const GSVector4i& r) = 0;
// TODO: virtual void Write(Target* t, const GSVector4i& r) = 0; // TODO: virtual void Write(Target* t, const GSVector4i& r) = 0;
@ -262,7 +262,6 @@ public:
void IncAge(); void IncAge();
bool UserHacks_HalfPixelOffset; bool UserHacks_HalfPixelOffset;
void ScaleTexture(GSTexture* texture);
bool ShallSearchTextureInsideRt(); bool ShallSearchTextureInsideRt();