diff options
| author | Alan Hourihane <alanh@vmware.com> | 2009-01-16 16:44:53 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@vmware.com> | 2009-01-16 16:44:53 +0000 |
| commit | 2e28c1fda24988241ef7abb91b7d896e38f5df26 (patch) | |
| tree | 593e70705d1f60babd77697b75f7618a94c6703b /src/mesa/shader/slang/slang_emit.c | |
| parent | 47ca0234dc9f83808cb141944537c78eaade5d55 (diff) | |
| parent | e442fe5ba53acf16c78339f19921d70dba3928f6 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/slang/slang_compile.c
Diffstat (limited to 'src/mesa/shader/slang/slang_emit.c')
| -rw-r--r-- | src/mesa/shader/slang/slang_emit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c index 6b744d72c8..ea446fa5d4 100644 --- a/src/mesa/shader/slang/slang_emit.c +++ b/src/mesa/shader/slang/slang_emit.c @@ -1349,9 +1349,10 @@ emit_copy(slang_emit_info *emitInfo, slang_ir_node *n) if (n->Store->File == PROGRAM_SAMPLER) { /* no code generated for sampler assignments, - * just copy the sampler index at compile time. + * just copy the sampler index/target at compile time. */ n->Store->Index = n->Children[1]->Store->Index; + n->Store->TexTarget = n->Children[1]->Store->TexTarget; return NULL; } |