comparison libvo/vo_gl.c @ 35445:19c56dc40a51

Fix alpha for ASS subtitles. EOSD always needs to use MODULATE since the vertex colour might contain alpha.

35444:4644c320daf4

    };
    mpglMatrixMode(GL_PROJECTION);
    mpglPushMatrix();
    mpglLoadMatrixf(matrix);
  }
  if (osd_color != 0xffffff)
    mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
  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
    // render alpha
    mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);

    for (i = 0; i < osdtexCnt; i++) {
      struct osdcoords *c = osdcoords + i;
      mpglBindTexture(gl_target, osdtex[i]);
      glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0);
    }
  }
  // set rendering parameters back to defaults
  mpglDisable(GL_BLEND);
  if (osd_color != 0xffffff)
    mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  if (!scaled_osd)
    mpglPopMatrix();
  mpglBindTexture(gl_target, 0);
}

35445:19c56dc40a51

    };
    mpglMatrixMode(GL_PROJECTION);
    mpglPushMatrix();
    mpglLoadMatrixf(matrix);
  }
  mpglEnable(GL_BLEND);
  if (draw_eosd) {
    mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    mpglCallList(eosdDispList);
    mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  }
  if (draw_osd) {
    if (osd_color != 0xffffff)
      mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24));
    // draw OSD
#ifndef FAST_OSD
    // render alpha
    mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);

    for (i = 0; i < osdtexCnt; i++) {
      struct osdcoords *c = osdcoords + i;
      mpglBindTexture(gl_target, osdtex[i]);
      glDrawTex(c->x, c->y, c->w, c->h, 0, 0, c->w, c->h, c->sx, c->sy, using_tex_rect, 0, 0, 0);
    }
    if (osd_color != 0xffffff)
      mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  }
  // set rendering parameters back to defaults
  mpglDisable(GL_BLEND);
  if (!scaled_osd)
    mpglPopMatrix();
  mpglBindTexture(gl_target, 0);
}