RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-22 14:52:43 +00:00
Code Issues Releases Wiki Activity

vo_gl.c: Use early return instead of large if block

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31887 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31888 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-08-01 17:37:38 +00:00 committed by Uoti Urpala
parent 0edb9e62d0
commit 91565a3d77
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libvo/vo_gl.c
View File

@ -778,35 +778,35 @@ static void create_osd_texture(int x0, int y0, int w, int h,
static void do_render_osd(int type) {
int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0;
int draw_eosd = (type & RENDER_EOSD) && eosdDispList;
if (draw_osd || draw_eosd) {
// set special rendering parameters
if (!scaled_osd) {
mpglMatrixMode(GL_PROJECTION);
mpglPushMatrix();
mpglLoadIdentity();
mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1);
}
mpglEnable(GL_BLEND);
if (draw_eosd) {
mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
mpglCallList(eosdDispList);
}
if (draw_osd) {
mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24));
// draw OSD
#ifndef FAST_OSD
mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList);
#endif
mpglBlendFunc(GL_SRC_ALPHA, GL_ONE);
mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList);
}
// set rendering parameters back to defaults
mpglDisable(GL_BLEND);
if (!scaled_osd)
mpglPopMatrix();
mpglBindTexture(gl_target, 0);
if (!draw_osd && !draw_eosd)
return;
// set special rendering parameters
if (!scaled_osd) {
mpglMatrixMode(GL_PROJECTION);
mpglPushMatrix();
mpglLoadIdentity();
mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1);
}
mpglEnable(GL_BLEND);
if (draw_eosd) {
mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
mpglCallList(eosdDispList);
}
if (draw_osd) {
mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24));
// draw OSD
#ifndef FAST_OSD
mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList);
#endif
mpglBlendFunc(GL_SRC_ALPHA, GL_ONE);
mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList);
}
// set rendering parameters back to defaults
mpglDisable(GL_BLEND);
if (!scaled_osd)
mpglPopMatrix();
mpglBindTexture(gl_target, 0);
}
static void draw_osd(void)