r500: shift tex src properly
authorDave Airlie <airlied@redhat.com>
Thu, 15 May 2008 06:24:54 +0000 (16:24 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 15 May 2008 08:40:07 +0000 (18:40 +1000)
src/mesa/drivers/dri/r300/r500_fragprog.c

index f65300a..7569783 100644 (file)
@@ -229,11 +229,11 @@ static void emit_tex(struct r500_fragment_program *fp,
        fp->inst[counter].inst0 = R500_INST_TYPE_TEX | mask
                | R500_INST_TEX_SEM_WAIT;
 
-       fp->inst[counter].inst1 = fpi->TexSrcUnit
+       fp->inst[counter].inst1 = R500_TEX_ID(fpi->TexSrcUnit)
                | R500_TEX_SEM_ACQUIRE | R500_TEX_IGNORE_UNCOVERED;
        
        if (fpi->TexSrcTarget == TEXTURE_RECT_INDEX)
-               fp->inst[counter].inst1 |= R500_TEX_UNSCALED;
+               fp->inst[counter].inst1 |= R500_TEX_UNSCALED;
 
        switch (opcode) {
        case OPCODE_TEX: