RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-01 03:40:43 +00:00
Code Issues Releases Wiki Activity

Handle case where get_image is called twice without a draw_image in-between

Browse Source 
(-vc ffmpeg12 seems to do this sometimes).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24007 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-08-03 18:29:54 +00:00
parent b95caec861
commit e58803edde
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libvo/vo_gl.c
View File

@ -88,6 +88,7 @@ static GLenum gl_format;
static GLenum gl_type; static GLenum gl_type;
static GLuint gl_buffer; static GLuint gl_buffer;
static int gl_buffersize; static int gl_buffersize;
static void *gl_bufferptr;
static GLuint fragprog; static GLuint fragprog;
static GLuint default_texs[22]; static GLuint default_texs[22];
static char *custom_prog; static char *custom_prog;
@ -371,6 +372,7 @@ static void uninitGl(void) {
if (DeleteBuffers && gl_buffer) if (DeleteBuffers && gl_buffer)
DeleteBuffers(1, &gl_buffer); DeleteBuffers(1, &gl_buffer);
gl_buffer = 0; gl_buffersize = 0; gl_buffer = 0; gl_buffersize = 0;
gl_bufferptr = NULL;
err_shown = 0; err_shown = 0;
} }
@ -677,7 +679,9 @@ static uint32_t get_image(mp_image_t *mpi) {
NULL, GL_DYNAMIC_DRAW); NULL, GL_DYNAMIC_DRAW);
gl_buffersize = mpi->stride[0] * mpi->h; 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); BindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
if (mpi->planes[0] == NULL) { if (mpi->planes[0] == NULL) {
if (!err_shown) if (!err_shown)
@ -715,6 +719,7 @@ static uint32_t draw_image(mp_image_t *mpi) {
planes[2] -= base; planes[2] -= base;
BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer); BindBuffer(GL_PIXEL_UNPACK_BUFFER, gl_buffer);
UnmapBuffer(GL_PIXEL_UNPACK_BUFFER); UnmapBuffer(GL_PIXEL_UNPACK_BUFFER);
gl_bufferptr = NULL;
slice = 0; // always "upload" full texture slice = 0; // always "upload" full texture
} }
glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0], glUploadTex(gl_target, gl_format, gl_type, planes[0], stride[0],