0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00

For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-11-06 18:39:37 +00:00
parent 4a85a32cb2
commit 14eb21fce0
2 changed files with 4 additions and 1 deletions

View File

@ -1193,7 +1193,7 @@ static void glSetupYUVFragprog(gl_conversion_params_t *params) {
memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs)); memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs));
else else
create_scaler_textures(YUV_CHROM_SCALER(type), &cur_texu, chrom_scale_texs); create_scaler_textures(YUV_CHROM_SCALER(type), &cur_texu, chrom_scale_texs);
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &i); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &i);
if (i < cur_texu) if (i < cur_texu)
mp_msg(MSGT_VO, MSGL_ERR, mp_msg(MSGT_VO, MSGL_ERR,
"[gl] %i texture units needed for this type of YUV fragment support (found %i)\n", "[gl] %i texture units needed for this type of YUV fragment support (found %i)\n",

View File

@ -225,6 +225,9 @@
#ifndef GL_PROGRAM_ERROR_POSITION #ifndef GL_PROGRAM_ERROR_POSITION
#define GL_PROGRAM_ERROR_POSITION 0x864B #define GL_PROGRAM_ERROR_POSITION 0x864B
#endif #endif
#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
#endif
#ifndef GL_PROGRAM_ERROR_STRING #ifndef GL_PROGRAM_ERROR_STRING
#define GL_PROGRAM_ERROR_STRING 0x8874 #define GL_PROGRAM_ERROR_STRING 0x8874
#endif #endif