From 356e703510170151a1678e9b1deab2ffdd5c92fb Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 3 Aug 2016 19:18:00 +0200 Subject: vo_opengl_cb: log better error message if OpenGL not initialized by user Otherwise opengl/video.c would confusingly complain about a wrong version, which in this case makes no sense. --- video/out/vo_opengl_cb.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'video') diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c index 4ac0c96b1e..06c90d2e5b 100644 --- a/video/out/vo_opengl_cb.c +++ b/video/out/vo_opengl_cb.c @@ -175,10 +175,16 @@ int mpv_opengl_cb_init_gl(struct mpv_opengl_cb_context *ctx, const char *exts, if (ctx->renderer) return MPV_ERROR_INVALID_PARAMETER; + talloc_free(ctx->gl); ctx->gl = talloc_zero(ctx, GL); mpgl_load_functions2(ctx->gl, get_proc_address, get_proc_address_ctx, exts, ctx->log); + if (!ctx->gl->version && !ctx->gl->es) { + MP_FATAL(ctx, "OpenGL not initialized.\n"); + return MPV_ERROR_UNSUPPORTED; + } + ctx->renderer = gl_video_init(ctx->gl, ctx->log, ctx->global); if (!ctx->renderer) return MPV_ERROR_UNSUPPORTED; -- cgit v1.2.3