From be0223b5019746ef42e00449ef58978cb69aba83 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sat, 8 Dec 2012 12:35:10 +0100
Subject: [PATCH] Use gl->conv_buffer instead of extra buffer.

---
 gfx/gl.c        | 19 +++----------------
 gfx/gl_common.h |  5 -----
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/gfx/gl.c b/gfx/gl.c
index ca99e10f49..2d5e4f5512 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -999,25 +999,16 @@ static inline void gl_copy_frame(gl_t *gl, const void *frame, unsigned width, un
       {
          const unsigned frame_bytes = width * height * gl->base_size;
          const unsigned line_bytes = width * gl->base_size;
-         
-         if (gl->tex_pack_buf_size < frame_bytes)
-         {
-            free(gl->tex_pack_buf);
-            gl->tex_pack_buf = malloc(frame_bytes);
-            gl->tex_pack_buf_size = frame_bytes;
-         }
 
-         uint8_t* dst = gl->tex_pack_buf;
+         uint8_t *dst = (uint8_t*)gl->conv_buffer;
          const uint8_t *src = (const uint8_t*)frame;
 
          for (unsigned h = 0; h < height; h++, src += pitch, dst += line_bytes)
-         {
             memcpy(dst, src, line_bytes);
-         }
-         
+
          glTexSubImage2D(GL_TEXTURE_2D,
                0, 0, 0, width, height, gl->texture_type,
-               gl->texture_fmt, gl->tex_pack_buf);         
+               gl->texture_fmt, gl->conv_buffer);         
       }
    }
 #else
@@ -1262,10 +1253,6 @@ static void gl_free(void *data)
    free(gl->empty_buf);
    free(gl->conv_buffer);
 
-#if defined(HAVE_OPENGLES)
-   free(gl->tex_pack_buf);
-#endif
-
    free(gl);
 }
 
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index 5aa7354486..44cafbdfa8 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -293,11 +293,6 @@ typedef struct gl
    struct scaler_ctx pbo_readback_scaler;
 #endif
 
-#if defined(HAVE_OPENGLES)
-   uint8_t* tex_pack_buf;
-   unsigned tex_pack_buf_size;
-#endif
-
 } gl_t;
 
 // Windows ... <_<