vlc | branch: master | Romain Vimont <ro...@videolabs.io> | Thu Dec 5 12:37:46 2019 +0100| [1dfd4d11a0a645d534ac55211a206e4e86914fc4] | committer: Thomas Guillem
opengl: remove pf_fragment_shader_init() It is not used anymore: the modules call interop->init() instead. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1dfd4d11a0a645d534ac55211a206e4e86914fc4 --- modules/video_output/opengl/converter.h | 28 ---------------------------- modules/video_output/opengl/vout_helper.c | 1 - 2 files changed, 29 deletions(-) diff --git a/modules/video_output/opengl/converter.h b/modules/video_output/opengl/converter.h index 6cd8298f52..ceb515d268 100644 --- a/modules/video_output/opengl/converter.h +++ b/modules/video_output/opengl/converter.h @@ -53,11 +53,6 @@ struct opengl_tex_converter_t /* True to dump shaders, set by the caller */ bool b_dump_shaders; - /* Function pointer to the shader init command, set by the caller, see - * opengl_fragment_shader_init() documentation. */ - GLuint (*pf_fragment_shader_init)(opengl_tex_converter_t *, GLenum, - vlc_fourcc_t, video_color_space_t); - /* GLSL version, set by the caller. 100 for GLSL ES, 120 for desktop GLSL */ unsigned glsl_version; /* Precision header, set by the caller. In OpenGLES, the fragment language @@ -113,27 +108,4 @@ struct opengl_tex_converter_t float alpha); }; -/** - * Generate a fragment shader - * - * This utility function can be used by hw opengl tex converters that need a - * generic fragment shader. It will compile a fragment shader generated from - * the chroma and the tex target. This will initialize all elements of the - * opengl_tex_converter_t struct except for priv, pf_allocate_texture, - * pf_update - * - * \param tc OpenGL tex converter - * \param tex_target GL_TEXTURE_2D or GL_TEXTURE_RECTANGLE - * \param chroma chroma used to generate the fragment shader - * \param yuv_space if not COLOR_SPACE_UNDEF, YUV planes will be converted to - * RGB according to the color space - * \return the compiled fragment shader or 0 in case of error - */ -static inline GLuint -opengl_fragment_shader_init(opengl_tex_converter_t *tc, GLenum tex_target, - vlc_fourcc_t chroma, video_color_space_t yuv_space) -{ - return tc->pf_fragment_shader_init(tc, tex_target, chroma, yuv_space); -} - #endif /* include-guard */ diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c index 9df7e873d8..b78d9e7594 100644 --- a/modules/video_output/opengl/vout_helper.c +++ b/modules/video_output/opengl/vout_helper.c @@ -546,7 +546,6 @@ opengl_init_program(vout_display_opengl_t *vgl, vlc_video_context *context, tc->gl = vgl->gl; tc->vt = &vgl->vt; tc->b_dump_shaders = b_dump_shaders; - tc->pf_fragment_shader_init = opengl_fragment_shader_init_impl; #if defined(USE_OPENGL_ES2) interop->is_gles = true; tc->glsl_version = 100; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
