summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-07-30 09:03:43 -0600
committerBrian Paul <[email protected]>2009-07-30 09:03:43 -0600
commit1e355a0cb36f206e681d1098b425ac541bc80840 (patch)
treeeed4fe1992f6f84d3008596dc72e743f80a420b2 /src/mesa
parent288299ae12603cf7ab0388db426d764c3f31304e (diff)
parent35e3449ad7a01c63219249b37886d59e93cbf7ac (diff)
Merge branch 'mesa_7_5_branch'
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/arbprogparse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 4baacdf2416..0f530ebb8a5 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -2027,8 +2027,8 @@ parse_param (GLcontext * ctx, const GLubyte ** inst, struct var_cache **vc_head,
if (specified_length != (int)param_var->param_binding_length) {
program_error(ctx, Program->Position,
"Declared parameter array length does not match parameter list");
+ return 1;
}
- return 1;
}
(*inst)++;