Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c b/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c
index d13b2be42db78d7231dc2d06290342433c450c0f..205eecd11298339a11d2ee1673717f6624964a6d 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_emulate_loops.c
@@ -386,8 +386,6 @@ static int build_loop_info(struct radeon_compiler * c, struct loop_info * loop,
                        case RC_OPCODE_SNE:
                                break;
                        default:
-                               rc_error(c, "%s: expected conditional",
-                                                               __FUNCTION__);
                                return 0;
                        }
                        loop->Cond = loop->If->Prev;
@@ -431,8 +429,10 @@ static int transform_loop(struct emulate_loop_state * s,
 
        loop = &s->Loops[s->LoopCount++];
 
-       if (!build_loop_info(s->C, loop, inst))
+       if (!build_loop_info(s->C, loop, inst)) {
+               rc_error(s->C, "Failed to build loop info\n");
                return 0;
+       }
 
        if(try_unroll_loop(s->C, loop)){
                return 1;
@@ -470,7 +470,7 @@ static int transform_loop(struct emulate_loop_state * s,
        return 1;
 }
 
-void rc_transform_loops(struct radeon_compiler *c)
+void rc_transform_loops(struct radeon_compiler *c, void *user)
 {
        struct emulate_loop_state * s = &c->loop_state;
        struct rc_instruction * ptr;
@@ -487,7 +487,7 @@ void rc_transform_loops(struct radeon_compiler *c)
        }
 }
 
-void rc_unroll_loops(struct radeon_compiler *c)
+void rc_unroll_loops(struct radeon_compiler *c, void *user)
 {
        struct rc_instruction * inst;
        struct loop_info loop;
@@ -503,7 +503,7 @@ void rc_unroll_loops(struct radeon_compiler *c)
        }
 }
 
-void rc_emulate_loops(struct radeon_compiler *c)
+void rc_emulate_loops(struct radeon_compiler *c, void *user)
 {
        struct emulate_loop_state * s = &c->loop_state;
        int i;
@@ -511,11 +511,12 @@ void rc_emulate_loops(struct radeon_compiler *c)
         * loops are unrolled first.
         */
        for( i = s->LoopCount - 1; i >= 0; i-- ){
+               unsigned int iterations;
+
                if(!s->Loops[i].EndLoop){
                        continue;
                }
-               unsigned int iterations = loop_max_possible_iterations(
-                                       s->C, &s->Loops[i]);
+               iterations = loop_max_possible_iterations(s->C, &s->Loops[i]);
                unroll_loop(s->C, &s->Loops[i], iterations);
        }
 }