vlc | branch: master | Romain Vimont <[email protected]> | Wed Jan 8 16:01:01 2020 +0100| [e21e77a889ed32d44900ffb7b65aa6b2bcb09f43] | committer: Thomas Guillem
opengl: rename opengl_fragment_shader_init_impl Remove the _impl suffix, this function is now always called directly. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e21e77a889ed32d44900ffb7b65aa6b2bcb09f43 --- modules/video_output/opengl/fragment_shaders.c | 4 ++-- modules/video_output/opengl/internal.h | 4 ++-- modules/video_output/opengl/vout_helper.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/video_output/opengl/fragment_shaders.c b/modules/video_output/opengl/fragment_shaders.c index d8a3d965fc..b273ddf311 100644 --- a/modules/video_output/opengl/fragment_shaders.c +++ b/modules/video_output/opengl/fragment_shaders.c @@ -564,8 +564,8 @@ opengl_interop_init_impl(struct vlc_gl_interop *interop, GLenum tex_target, } GLuint -opengl_fragment_shader_init_impl(opengl_tex_converter_t *tc, GLenum tex_target, - vlc_fourcc_t chroma, video_color_space_t yuv_space) +opengl_fragment_shader_init(opengl_tex_converter_t *tc, GLenum tex_target, + vlc_fourcc_t chroma, video_color_space_t yuv_space) { struct vlc_gl_interop *interop = tc->interop; diff --git a/modules/video_output/opengl/internal.h b/modules/video_output/opengl/internal.h index cef1ba0b4d..e881e7950a 100644 --- a/modules/video_output/opengl/internal.h +++ b/modules/video_output/opengl/internal.h @@ -29,8 +29,8 @@ opengl_interop_init_impl(struct vlc_gl_interop *interop, GLenum tex_target, vlc_fourcc_t chroma, video_color_space_t yuv_space); GLuint -opengl_fragment_shader_init_impl(opengl_tex_converter_t *, - GLenum, vlc_fourcc_t, video_color_space_t); +opengl_fragment_shader_init(opengl_tex_converter_t *, + GLenum, vlc_fourcc_t, video_color_space_t); int opengl_interop_generic_init(struct vlc_gl_interop *interop, bool); diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c index b78d9e7594..59a77b71f6 100644 --- a/modules/video_output/opengl/vout_helper.c +++ b/modules/video_output/opengl/vout_helper.c @@ -632,9 +632,9 @@ opengl_init_program(vout_display_opengl_t *vgl, vlc_video_context *context, } GLuint fragment_shader = - opengl_fragment_shader_init_impl(tc, interop->tex_target, - interop->sw_fmt.i_chroma, - interop->sw_fmt.space); + opengl_fragment_shader_init(tc, interop->tex_target, + interop->sw_fmt.i_chroma, + interop->sw_fmt.space); if (!fragment_shader) { vlc_object_delete(interop); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
