fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 04:40:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
The glsl/multitex demo runs now.
This commit is contained in:
Brian Paul 2008-10-10 16:36:40 -06:00
parent 33ff407874
commit 01e312a73b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/cell/ppu/cell_gen_fp.c
View file

@ -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);

5
src/gallium/drivers/cell/spu/spu_funcs.c
View file

@ -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];