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

gsdx-ogl: use a local buffer to store offscreen texture 

It will allow to read texture in // (and potentially could be useful
for recording)
This commit is contained in:
Gregory Hainaut 2015-05-18 11:29:04 +02:00
parent 79a9254894
commit 2783da4a22
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/GSdx/GSTextureOGL.cpp
View File

@ -41,7 +41,6 @@ namespace PboPool {
uint32 m_current_pbo = 0; uint32 m_current_pbo = 0;
uint32 m_size; uint32 m_size;
bool m_texture_storage; bool m_texture_storage;
uint8* m_gpu_texture;
GLsync m_fence[PBO_POOL_SIZE]; GLsync m_fence[PBO_POOL_SIZE];
const uint32 m_pbo_size = 4*1024*1024; const uint32 m_pbo_size = 4*1024*1024;
@ -83,8 +82,6 @@ namespace PboPool {
NextPbo(); NextPbo();
} }
UnbindPbo(); UnbindPbo();
m_gpu_texture = (uint8*)_aligned_malloc(1024 * 1024 * 4, 32);
} }
char* Map(uint32 size) { char* Map(uint32 size) {
@ -153,8 +150,6 @@ namespace PboPool {
gl_BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); gl_BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
} }
gl_DeleteBuffers(countof(m_pool), m_pool); gl_DeleteBuffers(countof(m_pool), m_pool);
_aligned_free(m_gpu_texture);
} }
void BindPbo() { void BindPbo() {
@ -202,7 +197,7 @@ namespace PboPool {
// glPixelStorei(GL_UNPACK_ALIGNMENT, 1); // glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read) GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read)
: m_pbo_size(0), m_dirty(false), m_clean(false) : m_pbo_size(0), m_dirty(false), m_clean(false), m_local_buffer(NULL)
{ {
// OpenGL didn't like dimensions of size 0 // OpenGL didn't like dimensions of size 0
m_size.x = max(1,w); m_size.x = max(1,w);
@ -254,6 +249,8 @@ GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read)
// Generate & Allocate the buffer // Generate & Allocate the buffer
switch (m_type) { switch (m_type) {
case GSTexture::Offscreen: case GSTexture::Offscreen:
// 8B is the worst case for depth/stencil
m_local_buffer = (uint8*)_aligned_malloc(m_size.x * m_size.y * 8, 32);
case GSTexture::Texture: case GSTexture::Texture:
case GSTexture::RenderTarget: case GSTexture::RenderTarget:
case GSTexture::DepthStencil: case GSTexture::DepthStencil:
@ -280,6 +277,9 @@ GSTextureOGL::~GSTextureOGL()
} }
glDeleteTextures(1, &m_texture_id); glDeleteTextures(1, &m_texture_id);
if (m_local_buffer)
_aligned_free(m_local_buffer);
} }
void GSTextureOGL::Invalidate() void GSTextureOGL::Invalidate()
@ -365,7 +365,7 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
#if 0 #if 0
// Maybe it is as good as the code below. I don't know // Maybe it is as good as the code below. I don't know
gl_GetTextureImage(m_texture_id, GL_TEX_LEVEL_0, m_int_format, m_int_type, 1024*1024*16, PboPool::m_gpu_texture); gl_GetTextureImage(m_texture_id, GL_TEX_LEVEL_0, m_int_format, m_int_type, 1024*1024*16, m_local_buffer);
#else #else
@ -374,12 +374,12 @@ bool GSTextureOGL::Map(GSMap& m, const GSVector4i* r)
gl_FramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture_id, 0); gl_FramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture_id, 0);
glPixelStorei(GL_PACK_ALIGNMENT, m_int_alignment); glPixelStorei(GL_PACK_ALIGNMENT, m_int_alignment);
glReadPixels(0, 0, m_size.x, m_size.y, m_int_format, m_int_type, PboPool::m_gpu_texture); glReadPixels(0, 0, m_size.x, m_size.y, m_int_format, m_int_type, m_local_buffer);
gl_BindFramebuffer(GL_READ_FRAMEBUFFER, 0); gl_BindFramebuffer(GL_READ_FRAMEBUFFER, 0);
#endif #endif
m.bits = PboPool::m_gpu_texture; m.bits = m_local_buffer;
m.pitch = m_size.x << m_int_shift; m.pitch = m_size.x << m_int_shift;
return true; return true;

2
plugins/GSdx/GSTextureOGL.h
View File

@ -47,6 +47,8 @@ class GSTextureOGL : public GSTexture
bool m_dirty; bool m_dirty;
bool m_clean; bool m_clean;
uint8* m_local_buffer;
// internal opengl format/type/alignment // internal opengl format/type/alignment
GLenum m_int_format; GLenum m_int_format;
GLenum m_int_type; GLenum m_int_type;