summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Amsler <markus.amsler@oribi.org>2008-03-30 16:10:47 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2008-03-30 16:10:47 +0000
commit85e816882d8cd136e041c915698314ed1110e2f2 (patch)
tree76596523822e586294f678494db2306a384eac92
parent3e0797f3b702a1363bf238eb4826385860346137 (diff)
r300: Take PROGRAM_CONSTANT into account.
This bug was introduced by commit 978145a075255ae153ee05c2a037400e61558079.
-rw-r--r--src/mesa/drivers/dri/r300/r300_fragprog.c1
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 78ed44b09c..c664fb6562 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -736,6 +736,7 @@ static GLuint t_src(struct r300_fragment_program *fp,
break;
case PROGRAM_STATE_VAR:
case PROGRAM_NAMED_PARAM:
+ case PROGRAM_CONSTANT:
r = emit_const4fv(fp,
fp->mesa_program.Base.Parameters->
ParameterValues[fpsrc.Index]);
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index e741eb9b19..89ccca7dae 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -171,6 +171,7 @@ static unsigned long t_src_class(enum register_file file)
case PROGRAM_LOCAL_PARAM:
case PROGRAM_ENV_PARAM:
case PROGRAM_NAMED_PARAM:
+ case PROGRAM_CONSTANT:
case PROGRAM_STATE_VAR:
return PVS_SRC_REG_CONSTANT;
/*