[MPlayer-cvslog] r27899 - in trunk/libvo: gl_common.c gl_common.h
reimar
subversion at mplayerhq.hu
Thu Nov 6 19:39:37 CET 2008
Author: reimar
Date: Thu Nov 6 19:39:37 2008
New Revision: 27899
Log:
For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.
Modified:
trunk/libvo/gl_common.c
trunk/libvo/gl_common.h
Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c (original)
+++ trunk/libvo/gl_common.c Thu Nov 6 19:39:37 2008
@@ -1193,7 +1193,7 @@ static void glSetupYUVFragprog(gl_conver
memcpy(chrom_scale_texs, lum_scale_texs, sizeof(chrom_scale_texs));
else
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)
mp_msg(MSGT_VO, MSGL_ERR,
"[gl] %i texture units needed for this type of YUV fragment support (found %i)\n",
Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h (original)
+++ trunk/libvo/gl_common.h Thu Nov 6 19:39:37 2008
@@ -225,6 +225,9 @@
#ifndef GL_PROGRAM_ERROR_POSITION
#define GL_PROGRAM_ERROR_POSITION 0x864B
#endif
+#ifndef GL_MAX_TEXTURE_IMAGE_UNITS
+#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872
+#endif
#ifndef GL_PROGRAM_ERROR_STRING
#define GL_PROGRAM_ERROR_STRING 0x8874
#endif
More information about the MPlayer-cvslog
mailing list