cell: pass texture unit (sampler number) to txp() function

The glsl/multitex demo runs now.

diff --git a/src/gallium/drivers/cell/ppu/cell_gen_fp.c b/src/gallium/drivers/cell/ppu/cell_gen_fp.c
index 3d0e797..ef84059 100644 (file)
--- a/src/gallium/drivers/cell/ppu/cell_gen_fp.c
+++ b/src/gallium/drivers/cell/ppu/cell_gen_fp.c
@@ -1285,9 +1285,12 @@ static boolean
 emit_TXP(struct codegen *gen, const struct tgsi_full_instruction *inst)
 {
    const uint addr = lookup_function(gen->cell, "spu_txp");
+   const uint unit = inst->FullSrcRegisters[1].SrcRegister.Index;
    int ch;
    int coord_regs[4], d_regs[4];
 
+   assert(inst->FullSrcRegisters[1].SrcRegister.File == TGSI_FILE_SAMPLER);
+
    spe_comment(gen->f, -4, "CALL txp:");
 
    /* get src/dst reg info */
@@ -1314,6 +1317,7 @@ emit_TXP(struct codegen *gen, const struct tgsi_full_instruction *inst)
       for (i = 0; i < 4; i++) {
          spe_move(gen->f, 3 + i, coord_regs[i]);
       }
+      spe_load_uint(gen->f, 7, unit); /* sampler unit */
 
       /* branch to function, save return addr */
       spe_brasl(gen->f, SPE_REG_RA, addr);

diff --git a/src/gallium/drivers/cell/spu/spu_funcs.c b/src/gallium/drivers/cell/spu/spu_funcs.c
index c7bcb3d..7dd7fcd 100644 (file)
--- a/src/gallium/drivers/cell/spu/spu_funcs.c
+++ b/src/gallium/drivers/cell/spu/spu_funcs.c
@@ -101,9 +101,10 @@ spu_log2(vector float x)
 }
 
 static struct vec_4x4
-spu_txp(vector float s, vector float t, vector float r, vector float q)
+spu_txp(vector float s, vector float t, vector float r, vector float q,
+        unsigned unit)
 {
-   const uint unit = 0;
+   //const uint unit = 0;
    struct vec_4x4 colors;
    vector float coords[4];