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

gsdx device: use same target for fxaa/shaderboost/shaderfx 

It avoid to waste VRAM memory
This commit is contained in:
Gregory Hainaut 2019-02-12 12:12:41 +01:00 committed by lightningterror
parent 45dfb0dcdb
commit 31d95448ed
2 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/GSdx/Renderers/Common/GSDevice.cpp
View File

@ -31,10 +31,7 @@ GSDevice::GSDevice()
, m_merge(NULL) , m_merge(NULL)
, m_weavebob(NULL) , m_weavebob(NULL)
, m_blend(NULL) , m_blend(NULL)
, m_shaderfx(NULL) , m_target_tmp(NULL)
, m_fxaa(NULL)
, m_shadeboost(NULL)
, m_1x1(NULL)
, m_current(NULL) , m_current(NULL)
, m_frame(0) , m_frame(0)
{ {
@ -51,10 +48,7 @@ GSDevice::~GSDevice()
delete m_merge; delete m_merge;
delete m_weavebob; delete m_weavebob;
delete m_blend; delete m_blend;
delete m_shaderfx; delete m_target_tmp;
delete m_fxaa;
delete m_shadeboost;
delete m_1x1;
} }
bool GSDevice::Create(const std::shared_ptr<GSWnd>& wnd) bool GSDevice::Create(const std::shared_ptr<GSWnd>& wnd)
@ -74,19 +68,13 @@ bool GSDevice::Reset(int w, int h)
delete m_merge; delete m_merge;
delete m_weavebob; delete m_weavebob;
delete m_blend; delete m_blend;
delete m_shaderfx; delete m_target_tmp;
delete m_fxaa;
delete m_shadeboost;
delete m_1x1;
m_backbuffer = NULL; m_backbuffer = NULL;
m_merge = NULL; m_merge = NULL;
m_weavebob = NULL; m_weavebob = NULL;
m_blend = NULL; m_blend = NULL;
m_shaderfx = NULL; m_target_tmp = NULL;
m_fxaa = NULL;
m_shadeboost = NULL;
m_1x1 = NULL;
m_current = NULL; // current is special, points to other textures, no need to delete m_current = NULL; // current is special, points to other textures, no need to delete
@ -245,8 +233,6 @@ GSTexture* GSDevice::GetCurrent()
void GSDevice::Merge(GSTexture* sTex[3], GSVector4* sRect, GSVector4* dRect, const GSVector2i& fs, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c) void GSDevice::Merge(GSTexture* sTex[3], GSVector4* sRect, GSVector4* dRect, const GSVector2i& fs, const GSRegPMODE& PMODE, const GSRegEXTBUF& EXTBUF, const GSVector4& c)
{ {
// TODO: m_1x1
// KH:COM crashes at startup when booting *through the bios* due to m_merge being NULL. // KH:COM crashes at startup when booting *through the bios* due to m_merge being NULL.
// (texture appears to be non-null, and is being re-created at a size around like 1700x340, // (texture appears to be non-null, and is being re-created at a size around like 1700x340,
// dunno if that's relevant) -- air // dunno if that's relevant) -- air
@ -322,13 +308,13 @@ void GSDevice::ExternalFX()
{ {
GSVector2i s = m_current->GetSize(); GSVector2i s = m_current->GetSize();
if (ResizeTarget(&m_shaderfx)) if (ResizeTarget(&m_target_tmp))
{ {
GSVector4 sRect(0, 0, 1, 1); GSVector4 sRect(0, 0, 1, 1);
GSVector4 dRect(0, 0, s.x, s.y); GSVector4 dRect(0, 0, s.x, s.y);
StretchRect(m_current, sRect, m_shaderfx, dRect, ShaderConvert_TRANSPARENCY_FILTER, false); StretchRect(m_current, sRect, m_target_tmp, dRect, ShaderConvert_TRANSPARENCY_FILTER, false);
DoExternalFX(m_shaderfx, m_current); DoExternalFX(m_target_tmp, m_current);
} }
} }
@ -336,13 +322,13 @@ void GSDevice::FXAA()
{ {
GSVector2i s = m_current->GetSize(); GSVector2i s = m_current->GetSize();
if(ResizeTarget(&m_fxaa)) if(ResizeTarget(&m_target_tmp))
{ {
GSVector4 sRect(0, 0, 1, 1); GSVector4 sRect(0, 0, 1, 1);
GSVector4 dRect(0, 0, s.x, s.y); GSVector4 dRect(0, 0, s.x, s.y);
StretchRect(m_current, sRect, m_fxaa, dRect, ShaderConvert_TRANSPARENCY_FILTER, false); StretchRect(m_current, sRect, m_target_tmp, dRect, ShaderConvert_TRANSPARENCY_FILTER, false);
DoFXAA(m_fxaa, m_current); DoFXAA(m_target_tmp, m_current);
} }
} }
@ -350,13 +336,13 @@ void GSDevice::ShadeBoost()
{ {
GSVector2i s = m_current->GetSize(); GSVector2i s = m_current->GetSize();
if(ResizeTarget(&m_shadeboost)) if(ResizeTarget(&m_target_tmp))
{ {
GSVector4 sRect(0, 0, 1, 1); GSVector4 sRect(0, 0, 1, 1);
GSVector4 dRect(0, 0, s.x, s.y); GSVector4 dRect(0, 0, s.x, s.y);
StretchRect(m_current, sRect, m_shadeboost, dRect, ShaderConvert_COPY, false); StretchRect(m_current, sRect, m_target_tmp, dRect, ShaderConvert_COPY, false);
DoShadeBoost(m_shadeboost, m_current); DoShadeBoost(m_target_tmp, m_current);
} }
} }

5
plugins/GSdx/Renderers/Common/GSDevice.h
View File

@ -126,10 +126,7 @@ protected:
GSTexture* m_merge; GSTexture* m_merge;
GSTexture* m_weavebob; GSTexture* m_weavebob;
GSTexture* m_blend; GSTexture* m_blend;
GSTexture* m_shaderfx; GSTexture* m_target_tmp;
GSTexture* m_fxaa;
GSTexture* m_shadeboost;
GSTexture* m_1x1;
GSTexture* m_current; GSTexture* m_current;
struct {size_t stride, start, count, limit;} m_vertex; struct {size_t stride, start, count, limit;} m_vertex;
struct {size_t start, count, limit;} m_index; struct {size_t start, count, limit;} m_index;