diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2019-03-11 01:00:27 +0200 |
| commit | 199aabddcc0105b504cc8e0cb240bc3c89288c1a (patch) | |
| tree | fa7eb297a8e11b5e0d9339196f23918d6a4d0b85 /video/out/gpu/video_shaders.h | |
| parent | 7c565547b80fdc2a1bfdf31f9725129bcb16aa9d (diff) | |
| parent | 1d0349d3b5d9a263251fcb3b0d7e135d4731bfd0 (diff) | |
| download | mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.bz2 mpv-199aabddcc0105b504cc8e0cb240bc3c89288c1a.tar.xz | |
Merge branch 'master' into pr6360
Manual changes done:
* Merged the interface-changes under the already master'd changes.
* Moved the hwdec-related option changes to video/decode/vd_lavc.c.
Diffstat (limited to 'video/out/gpu/video_shaders.h')
| -rw-r--r-- | video/out/gpu/video_shaders.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/video/out/gpu/video_shaders.h b/video/out/gpu/video_shaders.h index cd395d6377..f20d643e99 100644 --- a/video/out/gpu/video_shaders.h +++ b/video/out/gpu/video_shaders.h @@ -40,11 +40,9 @@ void pass_sample_oversample(struct gl_shader_cache *sc, struct scaler *scaler, void pass_linearize(struct gl_shader_cache *sc, enum mp_csp_trc trc); void pass_delinearize(struct gl_shader_cache *sc, enum mp_csp_trc trc); -void pass_color_map(struct gl_shader_cache *sc, +void pass_color_map(struct gl_shader_cache *sc, bool is_linear, struct mp_colorspace src, struct mp_colorspace dst, - enum tone_mapping algo, float tone_mapping_param, - float tone_mapping_desat, bool use_detected_peak, - bool gamut_warning, bool is_linear); + const struct gl_tone_map_opts *opts); void pass_sample_deband(struct gl_shader_cache *sc, struct deband_opts *opts, AVLFG *lfg, enum mp_csp_trc trc); |