summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-09-20 10:36:45 -0600
committerBrian Paul <brianp@vmware.com>2009-09-20 10:36:45 -0600
commitebf2710b2fd21ae9a6604c015ca7a948589f5a8c (patch)
treedd6b9da40b44824a1a4bdcfb4b3b2fc7edef3233 /src/mesa/drivers/dri/r300
parented4076b5b8c5d3c024e291f42a8730b4f71226c9 (diff)
parent82c2f7756af19f0a19aeda7ea1f627262e4561c0 (diff)
Merge branch 'mesa_7_6_branch'
Conflicts: src/mesa/drivers/dri/intel/intel_clear.c
Diffstat (limited to 'src/mesa/drivers/dri/r300')
-rw-r--r--src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c
index 305dc074ee..c7227bbd15 100644
--- a/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c
+++ b/src/mesa/drivers/dri/r300/compiler/r300_fragprog_emit.c
@@ -352,7 +352,7 @@ void r300BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compi
if (emit.current_node < 3) {
int shift = 3 - emit.current_node;
int i;
- for(i = 0; i <= emit.current_node; ++i)
+ for(i = emit.current_node; i >= 0; --i)
code->code_addr[shift + i] = code->code_addr[i];
for(i = 0; i < shift; ++i)
code->code_addr[i] = 0;