summaryrefslogtreecommitdiffstats
path: root/video/out/opengl/ra_gl.c
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2017-08-18 02:04:29 +0200
committerNiklas Haas <git@haasn.xyz>2017-08-18 02:33:29 +0200
commit01058b16f98d57ed5ce8637731e1d56d44dbcc5c (patch)
treee9ad6caa00925c13f5e0bf446b31da703bac745b /video/out/opengl/ra_gl.c
parentbe05c9eb581f2fb1129088301cc48737b85a65fc (diff)
downloadmpv-01058b16f98d57ed5ce8637731e1d56d44dbcc5c.tar.bz2
mpv-01058b16f98d57ed5ce8637731e1d56d44dbcc5c.tar.xz
vo_opengl: allow texture uploads to fail
Surprisingly makes the code shorter, not longer
Diffstat (limited to 'video/out/opengl/ra_gl.c')
-rw-r--r--video/out/opengl/ra_gl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/video/out/opengl/ra_gl.c b/video/out/opengl/ra_gl.c
index 36109753aa..f63bbe3ea5 100644
--- a/video/out/opengl/ra_gl.c
+++ b/video/out/opengl/ra_gl.c
@@ -424,7 +424,7 @@ bool ra_is_gl(struct ra *ra)
return ra->fns == &ra_fns_gl;
}
-static void gl_tex_upload(struct ra *ra,
+static bool gl_tex_upload(struct ra *ra,
const struct ra_tex_upload_params *params)
{
GL *gl = ra_gl_get(ra);
@@ -480,6 +480,8 @@ static void gl_tex_upload(struct ra *ra,
buf_gl->fence = gl->FenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
}
}
+
+ return true;
}
static void gl_buf_destroy(struct ra *ra, struct ra_buf *buf)