diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-15 18:14:00 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-15 18:14:00 +0000 |
| commit | 45c0df9bcb10f7ba25039fa65f8575adf18f3301 (patch) | |
| tree | 986f5a52f1ee54080e44a9c9d66c7769a084863e | |
| parent | 1fbd767ef649f643b42749af3000b1276b9b00eb (diff) | |
| download | mpv-45c0df9bcb10f7ba25039fa65f8575adf18f3301.tar.bz2 mpv-45c0df9bcb10f7ba25039fa65f8575adf18f3301.tar.xz | |
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
| -rw-r--r-- | libvo/gl_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 4117d6de9f..5690b8a94c 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -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, |