diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 7 | ||||
| -rw-r--r-- | video/out/opengl/context.c | 9 |
3 files changed, 2 insertions, 16 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index d4b96f80df..8cf94ceaa0 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -46,7 +46,7 @@ Interface changes - add `--input-builtin-bindings` flag to control loading of built-in key bindings during start-up (default: yes). - add ``track-list/N/image`` sub-property - + - remove `--opengl-restrict` option --- mpv 0.33.0 --- - add `--d3d11-exclusive-fs` flag to enable D3D11 exclusive fullscreen mode when the player enters fullscreen. diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index e270f5ca92..08598cdc85 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -6101,13 +6101,6 @@ The following video options are currently all specific to ``--vo=gpu`` and no Only allow desktop/core GL -``--opengl-restrict=<version>`` - Restricts all OpenGL versions above a certain version. Versions are encoded - in hundreds, i.e. OpenGL 4.5 -> 450. As an example, --opengl-restrict=300 - would restrict OpenGL 3.0 and higher, effectively only allowing 2.x - contexts. Note that this only imposes a limit on context creation APIs, the - actual OpenGL context may still have a higher OpenGL version. (Default: 0) - ``--fbo-format=<fmt>`` Selects the internal format of textures used for FBOs. The format can influence performance and quality of the video output. ``fmt`` can be one 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; |