diff options
author | wm4 <wm4@nowhere> | 2012-08-07 02:21:19 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-07 02:21:19 +0200 |
commit | 477af1c777116fcfb96885195acbed5cca8a0d4c (patch) | |
tree | e1330b7156c7fe59b64af31c2304bc9dc6e3af70 /libvo/vo_gl.c | |
parent | 7484ae8e2ee5327400358e7c7cb974d84543aef6 (diff) | |
download | mpv-477af1c777116fcfb96885195acbed5cca8a0d4c.tar.bz2 mpv-477af1c777116fcfb96885195acbed5cca8a0d4c.tar.xz |
osd: remove FAST_OSD code
This code has never been active by default, ever since it was added
back in 2001. You had to edit config.h or configure manually to enable
it.
Diffstat (limited to 'libvo/vo_gl.c')
-rw-r--r-- | libvo/vo_gl.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index bfafebe15f..5453943fe9 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -66,19 +66,15 @@ struct gl_priv { int scaled_osd; //! Textures for OSD GLuint osdtex[MAX_OSD_PARTS]; -#ifndef FAST_OSD //! Alpha textures for OSD GLuint osdatex[MAX_OSD_PARTS]; -#endif GLuint eosd_texture; int eosd_texture_width, eosd_texture_height; struct eosd_packer *eosd; struct vertex_eosd *eosd_va; //! Display lists that draw the OSD parts GLuint osdDispList[MAX_OSD_PARTS]; -#ifndef FAST_OSD GLuint osdaDispList[MAX_OSD_PARTS]; -#endif //! How many parts the OSD currently consists of int osdtexCnt; int osd_color; @@ -267,11 +263,9 @@ static void clearOSD(struct vo *vo) if (!p->osdtexCnt) return; gl->DeleteTextures(p->osdtexCnt, p->osdtex); -#ifndef FAST_OSD gl->DeleteTextures(p->osdtexCnt, p->osdatex); for (i = 0; i < p->osdtexCnt; i++) gl->DeleteLists(p->osdaDispList[i], 1); -#endif for (i = 0; i < p->osdtexCnt; i++) gl->DeleteLists(p->osdDispList[i], 1); p->osdtexCnt = 0; @@ -695,7 +689,6 @@ static void create_osd_texture(void *ctx, int x0, int y0, int w, int h, glUploadTex(gl, p->target, GL_LUMINANCE, GL_UNSIGNED_BYTE, src, stride, 0, 0, w, h, 0); -#ifndef FAST_OSD gl->GenTextures(1, &p->osdatex[p->osdtexCnt]); gl->BindTexture(p->target, p->osdatex[p->osdtexCnt]); glCreateClearTex(gl, p->target, GL_ALPHA, GL_ALPHA, GL_UNSIGNED_BYTE, @@ -711,19 +704,17 @@ static void create_osd_texture(void *ctx, int x0, int y0, int w, int h, 0, 0, w, h, 0); free(tmp); } -#endif gl->BindTexture(p->target, 0); // Create a list for rendering this OSD part -#ifndef FAST_OSD p->osdaDispList[p->osdtexCnt] = gl->GenLists(1); gl->NewList(p->osdaDispList[p->osdtexCnt], GL_COMPILE); // render alpha gl->BindTexture(p->target, p->osdatex[p->osdtexCnt]); glDrawTex(gl, x0, y0, w, h, 0, 0, w, h, sx, sy, p->use_rectangle == 1, 0, 0); gl->EndList(); -#endif + p->osdDispList[p->osdtexCnt] = gl->GenLists(1); gl->NewList(p->osdDispList[p->osdtexCnt], GL_COMPILE); // render OSD @@ -765,10 +756,8 @@ static void do_render_osd(struct vo *vo, int type) gl->Color4ub((p->osd_color >> 16) & 0xff, (p->osd_color >> 8) & 0xff, p->osd_color & 0xff, 0xff - (p->osd_color >> 24)); // draw OSD -#ifndef FAST_OSD gl->BlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); gl->CallLists(p->osdtexCnt, GL_UNSIGNED_INT, p->osdaDispList); -#endif gl->BlendFunc(GL_SRC_ALPHA, GL_ONE); gl->CallLists(p->osdtexCnt, GL_UNSIGNED_INT, p->osdDispList); } |