diff options
| author | Andre Maasikas <amaasikas@gmail.com> | 2009-12-04 16:36:41 +0200 |
|---|---|---|
| committer | Andre Maasikas <amaasikas@gmail.com> | 2009-12-08 15:39:39 +0200 |
| commit | 50ab51101e4c5e64ab92c260c324fb66a98851a8 (patch) | |
| tree | a405eb43013a74d06c6296da44cc508e708da5a4 /src/mesa/drivers/dri/r600/r700_assembler.c | |
| parent | 94723b60cf3dd838dfaf505450db8ef2e089399c (diff) | |
r600: glsl - allow specifying texture sampler via uniforms
looks kinda hackish, should rethink later
Diffstat (limited to 'src/mesa/drivers/dri/r600/r700_assembler.c')
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_assembler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c index 3738edbc2f..158c5fa549 100644 --- a/src/mesa/drivers/dri/r600/r700_assembler.c +++ b/src/mesa/drivers/dri/r600/r700_assembler.c @@ -4840,7 +4840,7 @@ GLboolean assemble_TEX(r700_AssemblerBase *pAsm) pAsm->need_tex_barrier = GL_TRUE; } // Set src1 to tex unit id - pAsm->S[1].src.reg = pAsm->pILInst[pAsm->uiCurInst].TexSrcUnit; + pAsm->S[1].src.reg = pAsm->SamplerUnits[pAsm->pILInst[pAsm->uiCurInst].TexSrcUnit]; pAsm->S[1].src.rtype = SRC_REG_TEMPORARY; //No sw info from mesa compiler, so hard code here. |