[MPlayer-cvslog] r24007 - trunk/libvo/vo_gl.c

[reimar]

Author: reimar
Date: Fri Aug  3 20:29:54 2007
New Revision: 24007

Log:
Handle case where get_image is called twice without a draw_image in-between
(-vc ffmpeg12 seems to do this sometimes).


Modified:
   trunk/libvo/vo_gl.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	(original)
+++ trunk/libvo/vo_gl.c	Fri Aug  3 20:29:54 2007
@@ -88,6 +88,7 @@ static GLenum gl_format;
 static GLenum gl_type;
 static GLuint gl_buffer;
 static int gl_buffersize;
+static void *gl_bufferptr;
 static GLuint fragprog;
 static GLuint default_texs[22];
 static char *custom_prog;
@@ -371,6 +372,7 @@ static void uninitGl(void) {
   if (DeleteBuffers && gl_buffer)
     DeleteBuffers(1, &gl_buffer);
   gl_buffer = 0; gl_buffersize = 0;
+  gl_bufferptr = NULL;
   err_shown = 0;
 }
 
@@ -677,7 +679,9 @@ static uint32_t get_image(mp_image_t *mp
                NULL, GL_DYNAMIC_DRAW);
     gl_buffersize = mpi->stride[0] * mpi->h;
   }
-  mpi->planes[0] = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
+  if (!gl_bufferptr)
+    gl_bufferptr = MapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY);
+  mpi->planes[0] = gl_bufferptr;
   BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
   if (mpi->planes[0] == NULL) {
     if (!err_shown)
@@ -715,6 +719,7 @@ static uint32_t draw_image(mp_image_t *m
     planes[2] -= base;
     BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
     UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
+    gl_bufferptr = NULL;
     slice = 0; // always "upload" full texture
   }
   glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0],