r300/compiler: Use memory_pool_array_reserve in r500-fragprog_emit

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / r3xx_fragprog.c

diff --git a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c
index bf9bea685ab66abf1ab32ffda65c5fd775dbf3d8..25bf373b6fde682c7211785790f307c21eeec016 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c
+++ b/src/mesa/drivers/dri/r300/compiler/r3xx_fragprog.c
@@ -24,7 +24,10 @@
 
 #include <stdio.h>
 
+#include "radeon_dataflow.h"
+#include "radeon_emulate_branches.h"
 #include "radeon_program_alu.h"
+#include "radeon_program_tex.h"
 #include "r300_fragprog.h"
 #include "r300_fragprog_swizzle.h"
 #include "r500_fragprog.h"
@@ -34,7 +37,10 @@ static void dataflow_outputs_mark_use(void * userdata, void * data,
                void (*callback)(void *, unsigned int, unsigned int))
 {
        struct r300_fragment_program_compiler * c = userdata;
-       callback(data, c->OutputColor, RC_MASK_XYZW);
+       callback(data, c->OutputColor[0], RC_MASK_XYZW);
+       callback(data, c->OutputColor[1], RC_MASK_XYZW);
+       callback(data, c->OutputColor[2], RC_MASK_XYZW);
+       callback(data, c->OutputColor[3], RC_MASK_XYZW);
        callback(data, c->OutputDepth, RC_MASK_W);
 }
 
@@ -43,7 +49,7 @@ static void rewrite_depth_out(struct r300_fragment_program_compiler * c)
        struct rc_instruction *rci;
 
        for (rci = c->Base.Program.Instructions.Next; rci != &c->Base.Program.Instructions; rci = rci->Next) {
-               struct rc_sub_instruction * inst = &rci->I;
+               struct rc_sub_instruction * inst = &rci->U.I;
 
                if (inst->DstReg.File != RC_FILE_OUTPUT || inst->DstReg.Index != c->OutputDepth)
                        continue;
@@ -80,46 +86,96 @@ static void rewrite_depth_out(struct r300_fragment_program_compiler * c)
        }
 }
 
+static void debug_program_log(struct r300_fragment_program_compiler* c, const char * where)
+{
+       if (c->Base.Debug) {
+               fprintf(stderr, "Fragment Program: %s\n", where);
+               rc_print_program(&c->Base.Program);
+       }
+}
+
 void r3xx_compile_fragment_program(struct r300_fragment_program_compiler* c)
 {
        rewrite_depth_out(c);
 
+       debug_program_log(c, "before compilation");
+
+       /* XXX Ideally this should be done only for r3xx, but since
+        * we don't have branching support for r5xx, we use the emulation
+        * on all chipsets. */
+       rc_emulate_branches(&c->Base);
+
+       debug_program_log(c, "after emulate branches");
+
        if (c->is_r500) {
                struct radeon_program_transformation transformations[] = {
-                       { &r500_transform_TEX, c },
+                       { &r500_transform_IF, 0 },
                        { &radeonTransformALU, 0 },
                        { &radeonTransformDeriv, 0 },
                        { &radeonTransformTrigScale, 0 }
                };
                radeonLocalTransform(&c->Base, 4, transformations);
 
+               debug_program_log(c, "after native rewrite part 1");
+
                c->Base.SwizzleCaps = &r500_swizzle_caps;
        } else {
                struct radeon_program_transformation transformations[] = {
-                       { &r300_transform_TEX, c },
                        { &radeonTransformALU, 0 },
                        { &radeonTransformTrigSimple, 0 }
                };
-               radeonLocalTransform(&c->Base, 3, transformations);
+               radeonLocalTransform(&c->Base, 2, transformations);
+
+               debug_program_log(c, "after native rewrite part 1");
 
                c->Base.SwizzleCaps = &r300_swizzle_caps;
        }
 
-       if (c->Base.Debug) {
-               fprintf(stderr, "Fragment Program: After native rewrite:\n");
-               rc_print_program(&c->Base.Program, 0);
-               fflush(stderr);
-       }
+       /* Run the common transformations too.
+        * Remember, lowering comes last! */
+       struct radeon_program_transformation common_transformations[] = {
+               { &radeonTransformTEX, c },
+       };
+       radeonLocalTransform(&c->Base, 1, common_transformations);
+
+       common_transformations[0].function = &radeonTransformALU;
+       radeonLocalTransform(&c->Base, 1, common_transformations);
+
+       if (c->Base.Error)
+               return;
+
+       debug_program_log(c, "after native rewrite part 2");
+
+       rc_dataflow_deadcode(&c->Base, &dataflow_outputs_mark_use, c);
+       if (c->Base.Error)
+               return;
+
+       debug_program_log(c, "after deadcode");
 
-       rc_dataflow_annotate(&c->Base, &dataflow_outputs_mark_use, c);
-       rc_dataflow_dealias(&c->Base);
        rc_dataflow_swizzles(&c->Base);
+       if (c->Base.Error)
+               return;
 
-       if (c->Base.Debug) {
-               fprintf(stderr, "Compiler: after dataflow passes:\n");
-               rc_print_program(&c->Base.Program, 0);
-               fflush(stderr);
-       }
+       debug_program_log(c, "after dataflow passes");
+
+       rc_pair_translate(c);
+       if (c->Base.Error)
+               return;
+
+       debug_program_log(c, "after pair translate");
+
+       rc_pair_schedule(c);
+       if (c->Base.Error)
+               return;
+
+       debug_program_log(c, "after pair scheduling");
+
+       rc_pair_regalloc(c, c->max_temp_regs);
+
+       if (c->Base.Error)
+               return;
+
+       debug_program_log(c, "after register allocation");
 
        if (c->is_r500) {
                r500BuildFragmentProgramHwCode(c);