RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_gpu: don't abort() if plane tex creation fails 

In this case, we just treat all uploads as automatically failing. That
error path already exists and is already handled correctly.

Fixes #8566
This commit is contained in:
Niklas Haas 2021-02-16 14:20:26 +01:00
parent b0b37df31f
commit c766e47b70
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/out/gpu/video.c
View File

@ -957,9 +957,6 @@ static void init_video(struct gl_video *p)
params.w, params.h);
plane->tex = ra_tex_create(p->ra, &params);
if (!plane->tex)
abort(); // shit happens
p->use_integer_conversion |= format->ctype == RA_CTYPE_UINT;
}
}
@ -3588,6 +3585,10 @@ static bool pass_upload_image(struct gl_video *p, struct mp_image *mpi, uint64_t
timer_pool_start(p->upload_timer);
for (int n = 0; n < p->plane_count; n++) {
struct texplane *plane = &vimg->planes[n];
if (!plane->tex) {
timer_pool_stop(p->upload_timer);
goto error;
}
struct ra_tex_upload_params params = {
.tex = plane->tex,