Create/allocate conversion textures before scaler textures.

Allows overriding gamma ramp texture also when using a non-trivial scaler.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25758 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-01-15 18:14:00 +00:00
parent 1fbd767ef6
commit 45c0df9bcb
1 changed files with 2 additions and 2 deletions

View File

@ -1160,13 +1160,13 @@ static void glSetupYUVFragprog(float brightness, float contrast,
float ry, ru, rv, rc;
float gy, gu, gv, gc;
float by, bu, bv, bc;
create_conv_textures(YUV_CONVERSION(type), &cur_texu, conv_texs,
brightness, contrast, uvcos, uvsin, rgamma, ggamma, bgamma);
create_scaler_textures(YUV_LUM_SCALER(type), &cur_texu, lum_scale_texs);
if (YUV_CHROM_SCALER(type) == YUV_LUM_SCALER(type))
memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs));
else
create_scaler_textures(YUV_CHROM_SCALER(type), &cur_texu, chrom_scale_texs);
create_conv_textures(YUV_CONVERSION(type), &cur_texu, conv_texs,
brightness, contrast, uvcos, uvsin, rgamma, ggamma, bgamma);
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i);
if (i < cur_texu)
mp_msg(MSGT_VO, MSGL_ERR,