From 65979986a923a8f08019b257c3fe72cd5e8ecf68 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Thu, 14 Sep 2017 08:04:55 +0200 Subject: vo_opengl: refactor into vo_gpu This is done in several steps: 1. refactor MPGLContext -> struct ra_ctx 2. move GL-specific stuff in vo_opengl into opengl/context.c 3. generalize context creation to support other APIs, and add --gpu-api 4. rename all of the --opengl- options that are no longer opengl-specific 5. move all of the stuff from opengl/* that isn't GL-specific into gpu/ (note: opengl/gl_utils.h became opengl/utils.h) 6. rename vo_opengl to vo_gpu 7. to handle window screenshots, the short-term approach was to just add it to ra_swchain_fns. Long term (and for vulkan) this has to be moved to ra itself (and vo_gpu altered to compensate), but this was a stop-gap measure to prevent this commit from getting too big 8. move ra->fns->flush to ra_gl_ctx instead 9. some other minor changes that I've probably already forgotten Note: This is one half of a major refactor, the other half of which is provided by rossy's following commit. This commit enables support for all linux platforms, while his version enables support for all non-linux platforms. Note 2: vo_opengl_cb.c also re-uses ra_gl_ctx so it benefits from the --opengl- options like --opengl-early-flush, --opengl-finish etc. Should be a strict superset of the old functionality. Disclaimer: Since I have no way of compiling mpv on all platforms, some of these ports were done blindly. Specifically, the blind ports included context_mali_fbdev.c and context_rpi.c. Since they're both based on egl_helpers, the port should have gone smoothly without any major changes required. But if somebody complains about a compile error on those platforms (assuming anybody actually uses them), you know where to complain. --- player/main.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'player') diff --git a/player/main.c b/player/main.c index 56a4f1d4cf..cf267fb170 100644 --- a/player/main.c +++ b/player/main.c @@ -297,21 +297,6 @@ static bool handle_help_options(struct MPContext *mpctx) return false; } -static void handle_deprecated_options(struct MPContext *mpctx) -{ - struct MPOpts *opts = mpctx->opts; - struct m_obj_settings *vo = opts->vo->video_driver_list; - if (vo && vo->name && strcmp(vo->name, "opengl-hq") == 0) { - MP_WARN(mpctx, - "--vo=opengl-hq is deprecated! Use --profile=opengl-hq instead.\n"); - // Fudge it. This will replace the --vo option too, which is why we - // unset/safe it, and later restore it. - talloc_free(vo->name); - vo->name = talloc_strdup(NULL, "opengl"); - m_config_set_profile(mpctx->mconfig, "opengl-hq", 0); - } -} - static int cfg_include(void *ctx, char *filename, int flags) { struct MPContext *mpctx = ctx; @@ -445,8 +430,6 @@ int mp_initialize(struct MPContext *mpctx, char **options) if (handle_help_options(mpctx)) return -2; - handle_deprecated_options(mpctx); - if (!print_libav_versions(mp_null_log, 0)) { // Using mismatched libraries can be legitimate, but even then it's // a bad idea. We don't acknowledge its usefulness and stability. -- cgit v1.2.3