From 14eb21fce00bfcab5145140f22bfd706d991c101 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 6 Nov 2008 18:39:37 +0000 Subject: 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 --- libvo/gl_common.c | 2 +- libvo/gl_common.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'libvo') diff --git a/libvo/gl_common.c b/libvo/gl_common.c index ed31a00ceb..192906285c 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1193,7 +1193,7 @@ static void glSetupYUVFragprog(gl_conversion_params_t *params) { 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", diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 1ff5e7371d..2408b1a2e9 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -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 -- cgit v1.2.3