r300: handle relative addressing in NQSSADCE

diff --git a/src/mesa/drivers/dri/r300/radeon_nqssadce.c b/src/mesa/drivers/dri/r300/radeon_nqssadce.c
index c56598b4a51dbb4dd33edf7c97512a0f5af9a25a..d917da58bb34ae488e8abd4e140be5dba96188f7 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_nqssadce.c
+++ b/src/mesa/drivers/dri/r300/radeon_nqssadce.c
@@ -46,6 +46,7 @@ static struct register_state *get_reg_state(struct nqssadce_state* s, GLuint fil
        switch(file) {
        case PROGRAM_TEMPORARY: return &s->Temps[index];
        case PROGRAM_OUTPUT: return &s->Outputs[index];
+       case PROGRAM_ADDRESS: return &s->Address;
        default: return 0;
        }
 }
@@ -114,7 +115,13 @@ static struct prog_instruction* track_used_srcreg(struct nqssadce_state* s,
                deswz_source = sourced;
        }
 
-       struct register_state *regstate = get_reg_state(s, inst->SrcReg[src].File, inst->SrcReg[src].Index);
+       struct register_state *regstate;
+
+       if (inst->SrcReg[src].RelAddr)
+               regstate = get_reg_state(s, PROGRAM_ADDRESS, 0);
+       else
+               regstate = get_reg_state(s, inst->SrcReg[src].File, inst->SrcReg[src].Index);
+
        if (regstate)
                regstate->Sourced |= deswz_source & 0xf;
 
@@ -178,6 +185,7 @@ static void process_instruction(struct nqssadce_state* s)
         * might change the instruction stream under us, so we have
         * to be careful with the inst pointer. */
        switch (inst->Opcode) {
+       case OPCODE_ARL:
        case OPCODE_DDX:
        case OPCODE_DDY:
        case OPCODE_FRC:

diff --git a/src/mesa/drivers/dri/r300/radeon_nqssadce.h b/src/mesa/drivers/dri/r300/radeon_nqssadce.h
index e3341692e4f22140a12414bd93ca1c9aa682c39b..8626f21c25e1e3b5becbc3f1e766c6800555395d 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_nqssadce.h
+++ b/src/mesa/drivers/dri/r300/radeon_nqssadce.h
@@ -58,6 +58,7 @@ struct nqssadce_state {
         */
        struct register_state Temps[MAX_PROGRAM_TEMPS];
        struct register_state Outputs[VERT_RESULT_MAX];
+       struct register_state Address;
 };