summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-01-17 11:09:03 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-01-17 22:59:15 -0800
commit07753bbb4a02aa7bf480dcf772f9f71bd84c9300 (patch)
treec170b1b8fe4c9f0c012202f570cb604cdf70ce08
parent0192eeb09cddcfe543ca87dd769efc61a1d73430 (diff)
downloadmpv-07753bbb4a02aa7bf480dcf772f9f71bd84c9300.tar.bz2
mpv-07753bbb4a02aa7bf480dcf772f9f71bd84c9300.tar.xz
vo_gpu: fix broken 10 bit via integer textures playback
The check_gl_features(p) call here checks whether dumb mode can be used. It uses the field use_integer_conversion, which is set _after_ the call in the same function. Move check_gl_features() to the end of the function, when use_integer_conversion is finally set. Fixes that it tried to use bilinear filtering with integer textures. The bug disabled the code that is supposed to convert it to non-integer textures.
-rw-r--r--video/out/gpu/video.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index 3a000aee97..96afd56564 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -862,9 +862,6 @@ static void init_video(struct gl_video *p)
}
p->color_swizzle[4] = '\0';
- // Format-dependent checks.
- check_gl_features(p);
-
mp_image_params_guess_csp(&p->image_params);
av_lfg_init(&p->lfg, 1);
@@ -909,6 +906,9 @@ static void init_video(struct gl_video *p)
debug_check_gl(p, "after video texture creation");
+ // Format-dependent checks.
+ check_gl_features(p);
+
gl_video_setup_hooks(p);
}