summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2006-12-20 17:19:45 -0700
committerBrian <brian@yutani.localnet.net>2006-12-20 17:19:45 -0700
commit2a62cbd24b02b0c222d9857ccf9a13e5e167f03a (patch)
treec40af38b32b75b93ff88efb5291444e44b0d8185 /src
parent3a8e2776a626c971bc02cd2ee3e576cb8b4267e9 (diff)
handle PROGRAM_UNIFORM, fix a _mesa_problem() call
Diffstat (limited to 'src')
-rw-r--r--src/mesa/tnl/t_vb_arbprogram.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index ef7b9eaa6c..906fd3f1e8 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -859,6 +859,7 @@ static struct reg cvp_load_reg( struct compilation *cp,
case PROGRAM_STATE_VAR:
case PROGRAM_CONSTANT:
+ case PROGRAM_UNIFORM:
reg = cvp_make_reg(FILE_STATE_PARAM, index);
if (rel)
return cvp_emit_rel(cp, reg, tmpreg);
@@ -870,7 +871,7 @@ static struct reg cvp_load_reg( struct compilation *cp,
case PROGRAM_WRITE_ONLY:
case PROGRAM_ADDRESS:
default:
- _mesa_problem(NULL, "Invalid register file %d in cvp_load_reg()");
+ _mesa_problem(NULL, "Invalid register file %d in cvp_load_reg()", file);
assert(0);
return tmpreg; /* can't happen */
}