From e3883512b119429004376cefff8a29043dbaff8d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 3 Oct 2021 13:14:13 +0100 Subject: vo_gpu: opengl: remove --opengl-restrict As the documentation of the toggle says - the implementation can (and will actually if they follow the GLX/EGL spec) return context version greater than the one requested. This happens with all Mesa drivers that I've tested as well as the Nvidia binary drivers. This toggle seems like a workaround for buggy drivers, yet it's lacking context about the vendor and version. Remove it for now - I'll be happy to reinstate it (partially or in full) as we get concrete details. This allows us to simplify ra_gl_ctx_test_version() making the whole context creation business easier to follow by mere mortals. Signed-off-by: Emil Velikov --- video/out/opengl/context.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'video/out/opengl') diff --git a/video/out/opengl/context.c b/video/out/opengl/context.c index c9f8445246..325dc86f0f 100644 --- a/video/out/opengl/context.c +++ b/video/out/opengl/context.c @@ -46,7 +46,6 @@ struct opengl_opts { int vsync_pattern[2]; int swapinterval; int early_flush; - int restrict_version; int gles_mode; }; @@ -58,7 +57,7 @@ const struct m_sub_options opengl_conf = { {"opengl-swapinterval", OPT_INT(swapinterval)}, {"opengl-check-pattern-a", OPT_INT(vsync_pattern[0])}, {"opengl-check-pattern-b", OPT_INT(vsync_pattern[1])}, - {"opengl-restrict", OPT_INT(restrict_version)}, + {"opengl-restrict", OPT_REMOVED(NULL)}, {"opengl-es", OPT_CHOICE(gles_mode, {"auto", GLES_AUTO}, {"yes", GLES_YES}, {"no", GLES_NO})}, {"opengl-early-flush", OPT_CHOICE(early_flush, @@ -101,12 +100,6 @@ bool ra_gl_ctx_test_version(struct ra_ctx *ctx, int version, bool es) void *tmp = talloc_new(NULL); opts = mp_get_config_group(tmp, ctx->global, &opengl_conf); - // Version too high - if (opts->restrict_version && version >= opts->restrict_version) { - ret = false; - goto done; - } - switch (opts->gles_mode) { case GLES_YES: ret = es; goto done; case GLES_NO: ret = !es; goto done; -- cgit v1.2.3