diff options
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/gl_osd.c | 4 | ||||
-rw-r--r-- | libvo/vo_gl3.c | 1 | ||||
-rw-r--r-- | libvo/vo_gl3_shaders.glsl | 11 |
3 files changed, 0 insertions, 16 deletions
diff --git a/libvo/gl_osd.c b/libvo/gl_osd.c index ce4bee5c03..74053afd4a 100644 --- a/libvo/gl_osd.c +++ b/libvo/gl_osd.c @@ -33,20 +33,16 @@ struct osd_fmt_entry { static const int blend_factors[SUBBITMAP_COUNT][2] = { [SUBBITMAP_LIBASS] = {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}, [SUBBITMAP_RGBA] = {GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA}, - [SUBBITMAP_OLD] = {GL_ONE, GL_ONE_MINUS_SRC_ALPHA}, }; static const struct osd_fmt_entry osd_to_gl3_formats[SUBBITMAP_COUNT] = { [SUBBITMAP_LIBASS] = {GL_RED, GL_RED, GL_UNSIGNED_BYTE}, [SUBBITMAP_RGBA] = {GL_RGBA, GL_BGRA, GL_UNSIGNED_BYTE}, - [SUBBITMAP_OLD] = {GL_RG, GL_RG, GL_UNSIGNED_BYTE}, }; static const struct osd_fmt_entry osd_to_gl_legacy_formats[SUBBITMAP_COUNT] = { [SUBBITMAP_LIBASS] = {GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE}, [SUBBITMAP_RGBA] = {GL_RGBA, GL_BGRA, GL_UNSIGNED_BYTE}, - [SUBBITMAP_OLD] = - {GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE}, }; struct mpgl_osd *mpgl_osd_init(GL *gl, bool legacy) diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c index f3c1767b78..f5df6a1ae4 100644 --- a/libvo/vo_gl3.c +++ b/libvo/vo_gl3.c @@ -252,7 +252,6 @@ static const struct fmt_entry mp_to_gl_formats[] = { static const char *osd_shaders[SUBBITMAP_COUNT] = { [SUBBITMAP_LIBASS] = "frag_osd_libass", [SUBBITMAP_RGBA] = "frag_osd_rgba", - [SUBBITMAP_OLD] = "frag_osd_old", }; diff --git a/libvo/vo_gl3_shaders.glsl b/libvo/vo_gl3_shaders.glsl index 20f8c597ad..04d886f9c0 100644 --- a/libvo/vo_gl3_shaders.glsl +++ b/libvo/vo_gl3_shaders.glsl @@ -66,17 +66,6 @@ void main() { out_color = texture(texture1, texcoord); } -#!section frag_osd_old -uniform sampler2D texture1; -uniform vec4 osd_color; - -in vec2 texcoord; -out vec4 out_color; - -void main() { - out_color = texture(texture1, texcoord).rrrg * osd_color; -} - #!section frag_video uniform sampler2D texture1; uniform sampler2D texture2; |