Mercurial > mplayer.hg
changeset 19939:1eb8f5470cba
Whitespace-only cosmetics
author | reimar |
---|---|
date | Fri, 22 Sep 2006 20:26:12 +0000 |
parents | f862045246a9 |
children | fb2063eaa445 |
files | libvo/vo_gl.c |
diffstat | 1 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl.c Fri Sep 22 20:23:17 2006 +0000 +++ b/libvo/vo_gl.c Fri Sep 22 20:26:12 2006 +0000 @@ -273,11 +273,11 @@ else if (i->w < 32 && i->h < 32 && smalltexcur < 256) smalltexcur++; else - eosdtexCnt++; + eosdtexCnt++; } if (eosdtexCnt) { - eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); - glGenTextures(eosdtexCnt, eosdtex); + eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); + glGenTextures(eosdtexCnt, eosdtex); } tinytexcur = smalltexcur = 0; for (i = img, curtex = eosdtex; i; i = i->next) { @@ -297,9 +297,9 @@ BindTexture(gl_target, largeeosdtex[1]); smalltexcur++; } else { - texSize(i->w, i->h, &sx, &sy); - BindTexture(gl_target, *curtex++); - glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0); + texSize(i->w, i->h, &sx, &sy); + BindTexture(gl_target, *curtex++); + glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0); } glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride, x, y, i->w, i->h, 0); @@ -325,8 +325,8 @@ BindTexture(gl_target, largeeosdtex[1]); smalltexcur++; } else { - texSize(i->w, i->h, &sx, &sy); - BindTexture(gl_target, *curtex++); + texSize(i->w, i->h, &sx, &sy); + BindTexture(gl_target, *curtex++); } glDrawTex(i->dst_x, i->dst_y, i->w, i->h, x, y, i->w, i->h, sx, sy, use_rectangle == 1, 0, 0); } @@ -644,10 +644,10 @@ if (osdtexCnt > 0 || eosdDispList) { // set special rendering parameters if (!scaled_osd) { - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - glLoadIdentity(); - glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); } glEnable(GL_BLEND); if (eosdDispList) { @@ -667,7 +667,7 @@ // set rendering parameters back to defaults glDisable (GL_BLEND); if (!scaled_osd) - glPopMatrix(); + glPopMatrix(); BindTexture(gl_target, 0); }