RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Whitespace-only cosmetics 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19945 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-09-22 20:26:12 +00:00
parent 40dad6e266
commit 953d001217
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libvo/vo_gl.c
View File

@ -273,11 +273,11 @@ static void genEOSD(ass_image_t *img) {
else if (i->w < 32 && i->h < 32 && smalltexcur < 256) else if (i->w < 32 && i->h < 32 && smalltexcur < 256)
smalltexcur++; smalltexcur++;
else else
eosdtexCnt++; eosdtexCnt++;
} }
if (eosdtexCnt) { if (eosdtexCnt) {
eosdtex = calloc(eosdtexCnt, sizeof(GLuint)); eosdtex = calloc(eosdtexCnt, sizeof(GLuint));
glGenTextures(eosdtexCnt, eosdtex); glGenTextures(eosdtexCnt, eosdtex);
} }
tinytexcur = smalltexcur = 0; tinytexcur = smalltexcur = 0;
for (i = img, curtex = eosdtex; i; i = i->next) { for (i = img, curtex = eosdtex; i; i = i->next) {
@ -297,9 +297,9 @@ static void genEOSD(ass_image_t *img) {
BindTexture(gl_target, largeeosdtex[1]); BindTexture(gl_target, largeeosdtex[1]);
smalltexcur++; smalltexcur++;
} else { } else {
texSize(i->w, i->h, &sx, &sy); texSize(i->w, i->h, &sx, &sy);
BindTexture(gl_target, *curtex++); BindTexture(gl_target, *curtex++);
glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0); glCreateClearTex(gl_target, GL_ALPHA, scale_type, sx, sy, 0);
} }
glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride, glUploadTex(gl_target, GL_ALPHA, GL_UNSIGNED_BYTE, i->bitmap, i->stride,
x, y, i->w, i->h, 0); x, y, i->w, i->h, 0);
@ -325,8 +325,8 @@ static void genEOSD(ass_image_t *img) {
BindTexture(gl_target, largeeosdtex[1]); BindTexture(gl_target, largeeosdtex[1]);
smalltexcur++; smalltexcur++;
} else { } else {
texSize(i->w, i->h, &sx, &sy); texSize(i->w, i->h, &sx, &sy);
BindTexture(gl_target, *curtex++); 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); 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 @@ flip_page(void)
if (osdtexCnt > 0 || eosdDispList) { if (osdtexCnt > 0 || eosdDispList) {
// set special rendering parameters // set special rendering parameters
if (!scaled_osd) { if (!scaled_osd) {
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1);
} }
glEnable(GL_BLEND); glEnable(GL_BLEND);
if (eosdDispList) { if (eosdDispList) {
@ -667,7 +667,7 @@ flip_page(void)
// set rendering parameters back to defaults // set rendering parameters back to defaults
glDisable (GL_BLEND); glDisable (GL_BLEND);
if (!scaled_osd) if (!scaled_osd)
glPopMatrix(); glPopMatrix();
BindTexture(gl_target, 0); BindTexture(gl_target, 0);
} }