aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/program.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-06 21:03:59 +0000
committermarha <marha@users.sourceforge.net>2011-04-06 21:03:59 +0000
commite2b908c356746281aba48128da7dc15a28f5a773 (patch)
tree5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa/program/program.c
parent1fc1b7f67928082b9e922463be25c232d9bcba6a (diff)
parent704e01fc69ebf6302aa1876906805147248abdaa (diff)
downloadvcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz
vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2
vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/program/program.c')
-rw-r--r--mesalib/src/mesa/program/program.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index e0bffc7c6..812c0dc50 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -75,10 +75,10 @@ _mesa_init_program(struct gl_context *ctx)
ASSERT(ctx->Const.FragmentProgram.MaxAddressOffset <= (1 << INST_INDEX_BITS));
/* If this fails, increase prog_instruction::TexSrcUnit size */
- ASSERT(MAX_TEXTURE_UNITS < (1 << 5));
+ ASSERT(MAX_TEXTURE_UNITS <= (1 << 5));
/* If this fails, increase prog_instruction::TexSrcTarget size */
- ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));
+ ASSERT(NUM_TEXTURE_TARGETS <= (1 << 3));
ctx->Program.ErrorPos = -1;
ctx->Program.ErrorString = _mesa_strdup("");