summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-05-15 16:24:54 +1000
committerDave Airlie <airlied@redhat.com>2008-05-15 18:40:07 +1000
commit9aa62c723807f569c55a8e0df069cb2eadad77ae (patch)
tree3dd0c77c86ec018ec4f4a0581044d4a653971b1f /src/mesa
parent76f32499d20ac9ee12a1b7aafbd2493749364a86 (diff)
r500: shift tex src properly
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r500_fragprog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.c b/src/mesa/drivers/dri/r300/r500_fragprog.c
index f65300a1bc..7569783f1f 100644
--- a/src/mesa/drivers/dri/r300/r500_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.c
@@ -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: