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

gsdx-ogl: remove the invalidation of texture 

It doesn't help the perf and only create overhead (test done on snow engine game)
This commit is contained in:
Gregory Hainaut 2016-04-21 21:07:17 +02:00
parent 3709b5aecc
commit 87867beb0e
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/GSdx/GSDevice.cpp
View File

@ -175,17 +175,6 @@ void GSDevice::Recycle(GSTexture* t)
{
if(t)
{
// FIXME: WARNING: Broken Texture Cache reuse render target without any
// cleaning (or uploading of correct gs mem data) Ofc it is wrong. If
// blending is enabled, rendering would be completely broken. However
// du to wrong invalidation of the TC it is sometimes better to reuse
// (partially) wrong data...
//
// Invalidating the data might be even worse. I'm not sure invalidating data really
// help on the perf. But people reports better perf on BDG2 (memory intensive) on OpenGL.
// It could be the reason.
t->Invalidate();
t->last_frame_used = m_frame;
m_pool.push_front(t);

1
plugins/GSdx/GSTexture.h
View File

@ -47,7 +47,6 @@ public:
virtual bool Map(GSMap& m, const GSVector4i* r = NULL) = 0;
virtual void Unmap() = 0;
virtual bool Save(const string& fn, bool user_image = false, bool dds = false) = 0;
virtual void Invalidate() {}
virtual uint32 GetID() { return 0; }
GSVector2 GetScale() const {return m_scale;}

12
plugins/GSdx/GSTextureOGL.cpp
View File

@ -159,7 +159,7 @@ namespace PboPool {
}
GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read)
: m_pbo_size(0), m_dirty(false), m_clean(false), m_local_buffer(NULL), m_r_x(0), m_r_y(0), m_r_w(0), m_r_h(0)
: m_pbo_size(0), m_clean(false), m_local_buffer(NULL), m_r_x(0), m_r_y(0), m_r_w(0), m_r_h(0)
{
// OpenGL didn't like dimensions of size 0
m_size.x = max(1,w);
@ -281,14 +281,6 @@ GSTextureOGL::~GSTextureOGL()
_aligned_free(m_local_buffer);
}
void GSTextureOGL::Invalidate()
{
if (m_dirty && glInvalidateTexImage) {
glInvalidateTexImage(m_texture_id, GL_TEX_LEVEL_0);
m_dirty = false;
}
}
bool GSTextureOGL::Update(const GSVector4i& r, const void* data, int pitch)
{
ASSERT(m_type != GSTexture::DepthStencil && m_type != GSTexture::Offscreen);
@ -299,7 +291,6 @@ bool GSTextureOGL::Update(const GSVector4i& r, const void* data, int pitch)
// Data upload is rather small typically 64B or 1024B. So don't bother with PBO
// and directly send the data to the GL synchronously
m_dirty = true;
m_clean = false;
uint32 row_byte = r.width() << m_int_shift;
@ -390,7 +381,6 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* _r)
} else if (m_type == GSTexture::Texture || m_type == GSTexture::RenderTarget) {
GL_PUSH("Upload Texture %d", m_texture_id); // POP is in Unmap
m_dirty = true;
m_clean = false;
uint32 row_byte = r.width() << m_int_shift;

4
plugins/GSdx/GSTextureOGL.h
View File

@ -44,7 +44,6 @@ class GSTextureOGL final : public GSTexture
GLuint m_texture_id; // the texture id
int m_pbo_size;
GLuint m_fbo_read;
bool m_dirty;
bool m_clean;
uint8* m_local_buffer;
@ -65,7 +64,6 @@ class GSTextureOGL final : public GSTexture
explicit GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read);
virtual ~GSTextureOGL();
void Invalidate() final;
bool Update(const GSVector4i& r, const void* data, int pitch) final;
bool Map(GSMap& m, const GSVector4i* r = NULL) final;
void Unmap() final;
@ -76,7 +74,7 @@ class GSTextureOGL final : public GSTexture
uint32 GetID() final { return m_texture_id; }
bool HasBeenCleaned() { return m_clean; }
void WasAttached() { m_clean = false; m_dirty = true; }
void WasAttached() { m_clean = false; }
void WasCleaned() { m_clean = true; }
uint32 GetMemUsage();