Mercurial > mplayer.hg

changeset 27865:428125c9e08e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.
author reimar
date Thu, 06 Nov 2008 18:39:37 +0000
parents ab92ea15c414
children 1697094e982a
files libvo/gl_common.c libvo/gl_common.h
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Thu Nov 06 12:41:23 2008 +0000
+++ b/libvo/gl_common.c	Thu Nov 06 18:39:37 2008 +0000
@@ -1193,7 +1193,7 @@
     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",
--- a/libvo/gl_common.h	Thu Nov 06 12:41:23 2008 +0000
+++ b/libvo/gl_common.h	Thu Nov 06 18:39:37 2008 +0000
@@ -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