summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.xyz>2019-01-03 00:44:15 +0100
committerJan Ekström <jeebjp@gmail.com>2019-02-18 01:54:06 +0200
commit4e8022da269d02c3bb23e4e119e4b1dc9aa3f3e4 (patch)
tree2abe9bd037f11acee31db27cf321b24e84aa8786
parentfdd671188d7edb8d150ec2c93656fb80bf031f12 (diff)
downloadmpv-4e8022da269d02c3bb23e4e119e4b1dc9aa3f3e4.tar.bz2
mpv-4e8022da269d02c3bb23e4e119e4b1dc9aa3f3e4.tar.xz
vo_gpu: allow color management in dumb mode
There's no point to disallow target-trc/prim in dumb mode, since they still work fine.
-rw-r--r--video/out/gpu/video.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index be49551dfb..5e805019ea 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -3513,9 +3513,9 @@ static bool check_dumb_mode(struct gl_video *p)
return false;
// otherwise, use auto-detection
- if (o->target_prim || o->target_trc || o->correct_downscaling ||
- o->linear_downscaling || o->linear_upscaling || o->sigmoid_upscaling ||
- o->interpolation || o->blend_subs || o->deband || o->unsharp)
+ if (o->correct_downscaling || o->linear_downscaling ||
+ o->linear_upscaling || o->sigmoid_upscaling || o->interpolation ||
+ o->blend_subs || o->deband || o->unsharp)
return false;
// check remaining scalers (tscale is already implicitly excluded above)
for (int i = 0; i < SCALER_COUNT; i++) {
@@ -3527,8 +3527,6 @@ static bool check_dumb_mode(struct gl_video *p)
}
if (o->user_shaders && o->user_shaders[0])
return false;
- if (p->use_lut_3d)
- return false;
return true;
}
@@ -3631,6 +3629,9 @@ static void check_gl_features(struct gl_video *p)
.early_flush = p->opts.early_flush,
.icc_opts = p->opts.icc_opts,
.hwdec_interop = p->opts.hwdec_interop,
+ .target_trc = p->opts.target_trc,
+ .target_prim = p->opts.target_prim,
+ .target_peak = p->opts.target_peak,
};
for (int n = 0; n < SCALER_COUNT; n++)
p->opts.scaler[n] = gl_video_opts_def.scaler[n];