github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-11 00:15:33 +01:00
Code Releases Activity

vo_opengl: fix uninitialization logic

Browse Source 
The FBOs we use never actually got cleaned up anywhere, and the vimg
planes were hard-coded to only clean up 3.
This commit is contained in:
Niklas Haas 2015-03-14 00:32:20 +01:00
parent 59c18dc73d
commit e07b6fcdfd
No known key found for this signature in database
GPG Key ID: 3BA77D4BFDB10BCE
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/out/gl_video.c
View File

@ -519,6 +519,12 @@ static void uninit_rendering(struct gl_video *p)
gl->DeleteTextures(1, &p->dither_texture);
p->dither_texture = 0;
fbotex_uninit(&p->indirect_fbo);
fbotex_uninit(&p->chroma_merge_fbo);
for (int n = 0; n < FBOSURFACES_MAX; n++)
fbotex_uninit(&p->surfaces[n].fbotex);
gl_video_reset_surfaces(p);
}
@ -713,7 +719,7 @@ static void uninit_video(struct gl_video *p)
struct video_image *vimg = &p->image;
for (int n = 0; n < 3; n++) {
for (int n = 0; n < p->plane_count; n++) {
struct texplane *plane = &vimg->planes[n];
gl->DeleteTextures(1, &plane->gl_texture);
@ -843,6 +849,7 @@ static void uninit_scaler(struct gl_video *p, int scaler_unit)
GL *gl = p->gl;
struct scaler *scaler = &p->scalers[scaler_unit];
fbotex_uninit(&scaler->sep_fbo);
gl->DeleteTextures(1, &scaler->gl_lut);
scaler->gl_lut = 0;
scaler->kernel = NULL;