summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-12-09 22:28:16 +0100
committerwm4 <wm4@nowhere>2014-12-09 22:28:16 +0100
commit56882eaee4211ba158e82ecbd3da6c760dcc945e (patch)
tree274642c2ba5bd92b3952c543f3a98dca4203b9bb
parent5f0a2b5908523ff3e792cab2f59901cb761332df (diff)
downloadmpv-56882eaee4211ba158e82ecbd3da6c760dcc945e.tar.bz2
mpv-56882eaee4211ba158e82ecbd3da6c760dcc945e.tar.xz
vo_opengl: don't crash if framebuffers are not available
In theory, vo_opengl supports operation without framebuffers. But this has been broken for a while now (commit cc00b3ff is a contender). It crashed because it unconditionally called gl->BindFramebuffer() (which is NULL if framebuffers are missing). Since this function is actually only called to set the default framebuffer, the simplest way to deal with this is to provide a dummy function, insteas of uglifying the code with additional if branches.
-rw-r--r--video/out/gl_common.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c
index dddb11a53e..5edd80146b 100644
--- a/video/out/gl_common.c
+++ b/video/out/gl_common.c
@@ -141,6 +141,11 @@ static bool is_software_gl(GL *gl)
strcmp(renderer, "Mesa X11") == 0;
}
+static void dummy_glBindFramebuffer(GLenum target, GLuint framebuffer)
+{
+ assert(framebuffer == 0);
+}
+
#define FN_OFFS(name) offsetof(GL, name)
#define DEF_FN(name) {FN_OFFS(name), {"gl" # name}}
@@ -618,6 +623,10 @@ void mpgl_load_functions2(GL *gl, void *(*get_fn)(void *ctx, const char *n),
mp_verbose(log, "Detected OpenGL features:");
list_features(gl->mpgl_caps, log, MSGL_V, false);
+
+ // Provided for simpler handling if no framebuffer support is available.
+ if (!gl->BindFramebuffer)
+ gl->BindFramebuffer = &dummy_glBindFramebuffer;
}
static void *get_procaddr_wrapper(void *ctx, const char *name)