diff options
| author | Eric Anholt <eric@anholt.net> | 2009-10-23 14:19:52 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-10-23 15:21:05 -0700 |
| commit | 49d402e275cdaf46de8db5a475dfe00509141195 (patch) | |
| tree | e5d17e8b69c1c0c8e96b43b70d8fcb09d077c942 /src/mesa/shader/program_parse.tab.c | |
| parent | bfd51dc34d45ba584683c70b1f854a513d9104d3 (diff) | |
| parent | 2d17dbfb5346b6d75e87c839148cbe125bf5cd6d (diff) | |
Merge remote branch 'origin/mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
Diffstat (limited to 'src/mesa/shader/program_parse.tab.c')
| -rw-r--r-- | src/mesa/shader/program_parse.tab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c index c0f50147bd..90867938a4 100644 --- a/src/mesa/shader/program_parse.tab.c +++ b/src/mesa/shader/program_parse.tab.c @@ -3394,7 +3394,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 1238 "program_parse.y" { - if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxParameters)) { + if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) > state->limits->MaxParameters)) { yyerror(& (yylsp[(1) - (1)]), state, "invalid parameter array size"); YYERROR; } else { |