From 02b478dfbc7109f30dd2dcb45414359294bb3f6c Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 16 May 2015 12:35:45 +0200 Subject: [PATCH] gsdx: plug the new PNG wrapper Drop various duplicated code :) --- plugins/GSdx/GSTextureOGL.cpp | 96 +++++++---------------------------- plugins/GSdx/GSTextureOGL.h | 4 -- plugins/GSdx/GSTextureSW.cpp | 50 +++--------------- plugins/GSdx/GSTextureSW.h | 3 -- plugins/GSdx/config.h | 5 +- 5 files changed, 27 insertions(+), 131 deletions(-) diff --git a/plugins/GSdx/GSTextureOGL.cpp b/plugins/GSdx/GSTextureOGL.cpp index 6e7bcfc6e3..4e2727b3e4 100644 --- a/plugins/GSdx/GSTextureOGL.cpp +++ b/plugins/GSdx/GSTextureOGL.cpp @@ -23,6 +23,7 @@ #include #include "GSTextureOGL.h" #include "GLState.h" +#include "GSPng.h" #ifdef ENABLE_OGL_DEBUG_MEM_BW extern uint64 g_real_texture_upload_byte; @@ -33,7 +34,7 @@ extern uint64 g_real_texture_upload_byte; // FIXME OGL4: investigate, only 1 unpack buffer always bound namespace PboPool { - + GLuint m_pool[PBO_POOL_SIZE]; uint32 m_offset[PBO_POOL_SIZE]; char* m_map[PBO_POOL_SIZE]; @@ -237,7 +238,7 @@ GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read) break; case 0: case GL_DEPTH32F_STENCIL8: - // Backbuffer & dss aren't important + // Backbuffer & dss aren't important m_int_format = 0; m_int_type = 0; m_int_alignment = 0; @@ -265,7 +266,7 @@ GSTextureOGL::GSTextureOGL(int type, int w, int h, int format, GLuint fbo_read) GSTextureOGL::~GSTextureOGL() { /* Unbind the texture from our local state */ - + if (m_texture_id == GLState::rt) GLState::rt = 0; if (m_texture_id == GLState::ds) @@ -489,78 +490,6 @@ void GSTextureOGL::Save(const string& fn, const void* image, uint32 pitch) fclose(fp); } -#ifdef ENABLE_OGL_PNG -#include "png++/png.hpp" - -void GSTextureOGL::SavePNG(const string& fn, const void* image, uint32 pitch) { - if (IsDss()) { - // TODO - //png::image img(m_size.x, m_size.y); - } else { - png::image img(m_size.x, m_size.y); - png::image img_opaque(m_size.x, m_size.y); - png::image img_alpha(m_size.x, m_size.y); - - uint8* data = (uint8*)image; - for(int h = 0; h < m_size.y; h++, data += pitch) { - for (int w = 0; w < m_size.x; w++) { -#if !defined(ENABLE_OGL_PNG_OPAQUE) && !defined(ENABLE_OGL_PNG_ALPHA) - png::rgba_pixel p(data[4*w+0], data[4*w+1], data[4*w+2], data[4*w+3]); - img.set_pixel(w, h, p); -#endif - -#ifdef ENABLE_OGL_PNG_OPAQUE - png::rgb_pixel po(data[4*w+0], data[4*w+1], data[4*w+2]); - img_opaque.set_pixel(w, h, po); -#endif -#ifdef ENABLE_OGL_PNG_ALPHA - png::gray_pixel pa(data[4*w+3]); - img_alpha.set_pixel(w, h, pa); -#endif - } - } - - std::string root = fn; - root.replace(fn.length()-4, 4, ""); -#if !defined(ENABLE_OGL_PNG_OPAQUE) && !defined(ENABLE_OGL_PNG_ALPHA) - img.write(root + "_full.png"); -#endif -#ifdef ENABLE_OGL_PNG_OPAQUE - img_opaque.write(root + "_opaque.png"); -#endif -#ifdef ENABLE_OGL_PNG_ALPHA - img_alpha.write(root + "_alpha.png"); -#endif - } -} -#endif - -void GSTextureOGL::SaveRaw(const string& fn, const void* image, uint32 pitch) -{ - // Build a raw CSV file - FILE* fp = fopen(fn.c_str(), "w"); - if (fp == NULL) - return; - - uint32* data = (uint32*)image; - - for(int h = m_size.y; h > 0; h--) { - for (int w = m_size.x; w > 0; w--, data += 1) { - if (*data > 0xffffff) - ; - else { - fprintf(fp, "%x", *data); - } - if ( w > 1) - fprintf(fp, ","); - } - fprintf(fp, "\n"); - } - - fclose(fp); -} - - bool GSTextureOGL::Save(const string& fn, bool dds) { // Collect the texture data @@ -568,6 +497,11 @@ bool GSTextureOGL::Save(const string& fn, bool dds) uint32 buf_size = pitch * m_size.y * 2;// Note *2 for security (depth/stencil) char* image = (char*)malloc(buf_size); bool status = true; +#ifdef ENABLE_OGL_DEBUG + GSPng::Format fmt = GSPng::RGB_A_PNG; +#else + GSPng::Format fmt = GSPng::RGB_PNG; +#endif if (IsBackbuffer()) { glReadPixels(0, 0, m_size.x, m_size.y, GL_RGBA, GL_UNSIGNED_BYTE, image); @@ -578,9 +512,12 @@ bool GSTextureOGL::Save(const string& fn, bool dds) glReadPixels(0, 0, m_size.x, m_size.y, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, image); gl_BindFramebuffer(GL_READ_FRAMEBUFFER, 0); + + fmt = GSPng::DEPTH_PNG; } else if(m_format == GL_R32I) { gl_GetTextureImage(m_texture_id, 0, GL_RED_INTEGER, GL_INT, buf_size, image); - SaveRaw(fn, image, pitch); + + fmt = GSPng::R32I_PNG; // Not supported in Save function status = false; @@ -590,16 +527,19 @@ bool GSTextureOGL::Save(const string& fn, bool dds) gl_FramebufferTexture2D(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture_id, 0); - if (m_format == GL_RGBA8) + if (m_format == GL_RGBA8) { glReadPixels(0, 0, m_size.x, m_size.y, GL_RGBA, GL_UNSIGNED_BYTE, image); + } else if (m_format == GL_R16UI) { glReadPixels(0, 0, m_size.x, m_size.y, GL_RED_INTEGER, GL_UNSIGNED_SHORT, image); + fmt = GSPng::R16I_PNG; // Not supported in Save function status = false; } else if (m_format == GL_R8) { + fmt = GSPng::R8I_PNG; glReadPixels(0, 0, m_size.x, m_size.y, GL_RED, GL_UNSIGNED_BYTE, image); // Not supported in Save function status = false; @@ -609,7 +549,7 @@ bool GSTextureOGL::Save(const string& fn, bool dds) } #ifdef ENABLE_OGL_PNG - if (status) SavePNG(fn, image, pitch); + GSPng::Save(fmt, fn, image, m_size.x, m_size.y, pitch); #else if (status) Save(fn, image, pitch); #endif diff --git a/plugins/GSdx/GSTextureOGL.h b/plugins/GSdx/GSTextureOGL.h index ef1b6bede8..6e58a37164 100644 --- a/plugins/GSdx/GSTextureOGL.h +++ b/plugins/GSdx/GSTextureOGL.h @@ -65,10 +65,6 @@ class GSTextureOGL : public GSTexture void Unmap(); bool Save(const string& fn, bool dds = false); void Save(const string& fn, const void* image, uint32 pitch); -#ifdef ENABLE_OGL_PNG - void SavePNG(const string& fn, const void* image, uint32 pitch); -#endif - void SaveRaw(const string& fn, const void* image, uint32 pitch); bool IsBackbuffer() { return (m_type == GSTexture::Backbuffer); } bool IsDss() { return (m_type == GSTexture::DepthStencil); } diff --git a/plugins/GSdx/GSTextureSW.cpp b/plugins/GSdx/GSTextureSW.cpp index 605e814614..a2b4b726e2 100644 --- a/plugins/GSdx/GSTextureSW.cpp +++ b/plugins/GSdx/GSTextureSW.cpp @@ -21,6 +21,7 @@ #include "stdafx.h" #include "GSTextureSW.h" +#include "GSPng.h" GSTextureSW::GSTextureSW(int type, int width, int height) : m_mapped(0) @@ -118,53 +119,18 @@ struct BITMAPINFOHEADER #endif -#ifdef ENABLE_OGL_PNG -#include "png++/png.hpp" - -void GSTextureSW::SavePNG(const string& fn) { - png::image img(m_size.x, m_size.y); - png::image img_opaque(m_size.x, m_size.y); - png::image img_alpha(m_size.x, m_size.y); - - uint8* data = (uint8*)m_data; - for(int h = 0; h < m_size.y; h++, data += m_pitch) { - for (int w = 0; w < m_size.x; w++) { -#if !defined(ENABLE_OGL_PNG_OPAQUE) && !defined(ENABLE_OGL_PNG_ALPHA) - png::rgba_pixel p(data[4*w+0], data[4*w+1], data[4*w+2], data[4*w+3]); - img.set_pixel(w, h, p); -#endif - -#ifdef ENABLE_OGL_PNG_OPAQUE - png::rgb_pixel po(data[4*w+0], data[4*w+1], data[4*w+2]); - img_opaque.set_pixel(w, h, po); -#endif -#ifdef ENABLE_OGL_PNG_ALPHA - png::gray_pixel pa(data[4*w+3]); - img_alpha.set_pixel(w, h, pa); -#endif - } - } - - std::string root = fn; - root.replace(fn.length()-4, 4, ""); -#if !defined(ENABLE_OGL_PNG_OPAQUE) && !defined(ENABLE_OGL_PNG_ALPHA) - img.write(root + "_full.png"); -#endif -#ifdef ENABLE_OGL_PNG_OPAQUE - img_opaque.write(root + "_opaque.png"); -#endif -#ifdef ENABLE_OGL_PNG_ALPHA - img_alpha.write(root + "_alpha.png"); -#endif -} -#endif - bool GSTextureSW::Save(const string& fn, bool dds) { if(dds) return false; // not implemented #ifdef ENABLE_OGL_PNG - SavePNG(fn); + +#ifdef ENABLE_OGL_DEBUG + GSPng::Format fmt = GSPng::RGB_A_PNG; +#else + GSPng::Format fmt = GSPng::RGB_PNG; +#endif + GSPng::Save(fmt, fn, (char*)m_data, m_size.x, m_size.y, m_pitch); return true; #else diff --git a/plugins/GSdx/GSTextureSW.h b/plugins/GSdx/GSTextureSW.h index 0160bbf860..b6f8a7f041 100644 --- a/plugins/GSdx/GSTextureSW.h +++ b/plugins/GSdx/GSTextureSW.h @@ -39,7 +39,4 @@ public: bool Map(GSMap& m, const GSVector4i* r); void Unmap(); bool Save(const string& fn, bool dds = false); -#ifdef ENABLE_OGL_PNG - void SavePNG(const string& fn); -#endif }; diff --git a/plugins/GSdx/config.h b/plugins/GSdx/config.h index 2e8fe8be9f..15c75710d1 100644 --- a/plugins/GSdx/config.h +++ b/plugins/GSdx/config.h @@ -49,11 +49,8 @@ //#define ENABLE_OPENCL #endif -#if defined(ENABLE_OGL_DEBUG) && defined(__linux__) && defined(PNGPP_SUPPORTED) +#if defined(__linux__) // Allow to dump texture as PNG (require libpng++). It reduces the size of the dump // and alpha is well supported (on linux) #define ENABLE_OGL_PNG -// The next two define allows to dump texture without alpha or only the alpha channel. -#define ENABLE_OGL_PNG_OPAQUE -#define ENABLE_OGL_PNG_ALPHA #endif