aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2010-08-31 20:51:37 +0200
committerMarek Olšák <[email protected]>2010-09-04 18:56:20 +0200
commita0fb406d9fd2bcd040f70ba639cc8342c0a92c6d (patch)
tree334e49b4ba4a1ec80ea59b70486518861de25a88 /src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
parent79088746a231d361232fc87ab4d578b08c7ce2a7 (diff)
r300/compiler: put emulate_loop_state in radeon_compiler
Diffstat (limited to 'src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c')
-rw-r--r--src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
index 9b60e30f586..5612a4e5ccc 100644
--- a/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
+++ b/src/mesa/drivers/dri/r300/compiler/r500_fragprog_emit.c
@@ -63,7 +63,7 @@ struct branch_info {
int Endif;
};
-struct loop_info {
+struct r500_loop_info {
int BgnLoop;
int BranchDepth;
@@ -84,7 +84,7 @@ struct emit_state {
unsigned int CurrentBranchDepth;
unsigned int BranchesReserved;
- struct loop_info * Loops;
+ struct r500_loop_info * Loops;
unsigned int CurrentLoopDepth;
unsigned int LoopsReserved;
@@ -387,13 +387,13 @@ static void emit_flowcontrol(struct emit_state * s, struct rc_instruction * inst
switch(inst->U.I.Opcode){
struct branch_info * branch;
- struct loop_info * loop;
+ struct r500_loop_info * loop;
case RC_OPCODE_BGNLOOP:
- memory_pool_array_reserve(&s->C->Pool, struct loop_info,
+ memory_pool_array_reserve(&s->C->Pool, struct r500_loop_info,
s->Loops, s->CurrentLoopDepth, s->LoopsReserved, 1);
loop = &s->Loops[s->CurrentLoopDepth++];
- memset(loop, 0, sizeof(struct loop_info));
+ memset(loop, 0, sizeof(struct r500_loop_info));
loop->BranchDepth = s->CurrentBranchDepth;
loop->BgnLoop = newip;