diff options
| -rw-r--r-- | DOCS/man/vo.rst | 4 | ||||
| -rw-r--r-- | video/out/gl_video.c | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index b6a6baf91d..443a6bdea1 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -537,10 +537,6 @@ Available video output drivers are: The slope of the sigmoid curve used for ``sigmoid-upscaling``, must be a float between 1.0 and 20.0. Defaults to 6.5 if not specified. - ``no-npot`` - Force use of power-of-2 texture sizes. For debugging only. - Borders will be distorted due to filtering. - ``glfinish`` Call ``glFinish()`` before and after swapping buffers (default: disabled). Slower, but might help getting better results when doing framedropping. diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 6c5fab58a1..ff2921c0f4 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -318,7 +318,6 @@ static const struct packed_fmt_entry mp_packed_formats[] = { }; const struct gl_video_opts gl_video_opts_def = { - .npot = 1, .dither_depth = -1, .dither_size = 6, .fbo_format = GL_RGBA16, @@ -336,7 +335,6 @@ const struct gl_video_opts gl_video_opts_def = { }; const struct gl_video_opts gl_video_opts_hq_def = { - .npot = 1, .dither_depth = 0, .dither_size = 6, .fbo_format = GL_RGBA16, @@ -369,7 +367,6 @@ const struct m_sub_options gl_video_conf = { OPT_FLAG("gamma-auto", gamma_auto, 0), OPT_CHOICE_C("target-prim", target_prim, 0, mp_csp_prim_names), OPT_CHOICE_C("target-trc", target_trc, 0, mp_csp_trc_names), - OPT_FLAG("npot", npot, 0), OPT_FLAG("pbo", pbo, 0), OPT_STRING_VALIDATE("scale", scaler[0].kernel.name, 0, validate_scaler_opt), OPT_STRING_VALIDATE("dscale", scaler[1].kernel.name, 0, validate_scaler_opt), @@ -662,14 +659,6 @@ static void pass_set_image_textures(struct gl_video *p, struct video_image *vimg } } -static int align_pow2(int s) -{ - int r = 1; - while (r < s) - r *= 2; - return r; -} - static void init_video(struct gl_video *p) { GL *gl = p->gl; @@ -714,11 +703,6 @@ static void init_video(struct gl_video *p) plane->tex_h = plane->h; if (!p->hwdec_active) { - if (!p->opts.npot) { - plane->tex_w = align_pow2(plane->tex_w); - plane->tex_h = align_pow2(plane->tex_h); - } - gl->ActiveTexture(GL_TEXTURE0 + n); gl->GenTextures(1, &plane->gl_texture); gl->BindTexture(p->gl_target, plane->gl_texture); |