[vlc-commits] [Git][videolan/vlc][master] opengl: fix tone mapping shader regression

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
38c594a1 by Niklas Haas at 2022-02-24T12:39:05+00:00
opengl: fix tone mapping shader regression

In libplacebo v4.192, specifying the tone mapping state object is no
longer optional. Failure to do this forces an internal fallback to a
fixed function hable shader.

- - - - -


1 changed file:

- modules/video_output/opengl/sampler.c


Changes:

=====================================
modules/video_output/opengl/sampler.c
=====================================
@@ -683,9 +683,10 @@ opengl_fragment_shader_init(struct vlc_gl_sampler *sampler, bool expose_planes)
         dst_space.primaries = var_InheritInteger(priv->gl, "target-prim");
         dst_space.transfer = var_InheritInteger(priv->gl, "target-trc");
 
+        struct pl_shader_obj *tone_map_state = NULL;
         pl_shader_color_map(sh, &color_params,
                 vlc_placebo_ColorSpace(fmt),
-                dst_space, NULL, false);
+                dst_space, &tone_map_state, false);
 
         struct pl_shader_obj *dither_state = NULL;
         int method = var_InheritInteger(priv->gl, "dither-algo");
@@ -718,6 +719,7 @@ opengl_fragment_shader_init(struct vlc_gl_sampler *sampler, bool expose_planes)
         }
 
         const struct pl_shader_res *res = priv->pl_sh_res = pl_shader_finalize(sh);
+        pl_shader_obj_destroy(&tone_map_state);
         pl_shader_obj_destroy(&dither_state);
 
         FREENULL(priv->uloc.pl_vars);



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/38c594a14a0f0bc6a487bbb2415908c85e95b757

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/38c594a14a0f0bc6a487bbb2415908c85e95b757
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance