diff options
author | Alan Hourihane <[email protected]> | 2009-01-13 23:54:46 +0000 |
---|---|---|
committer | Alan Hourihane <[email protected]> | 2009-01-14 00:12:33 +0000 |
commit | ef0e0f2550b8bc63972ee53a80578b19ff2a5bbc (patch) | |
tree | d8150daf92ef2d68b25e24d15bdb4c74c7b62d8c /src/mesa/shader/slang/slang_link.c | |
parent | 34d17d2bdc3da2fe8b669adc166f3ee07ad11391 (diff) |
glsl: support sampler arrays.
Diffstat (limited to 'src/mesa/shader/slang/slang_link.c')
-rw-r--r-- | src/mesa/shader/slang/slang_link.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index 26f5d61e048..05a3e2dee07 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -282,12 +282,14 @@ link_uniform_vars(GLcontext *ctx, for (i = 0; i < prog->NumInstructions; i++) { struct prog_instruction *inst = prog->Instructions + i; if (_mesa_is_tex_instruction(inst->Opcode)) { - /* + const GLint oldSampNum = inst->TexSrcUnit; + +#if 0 printf("====== remap sampler from %d to %d\n", - inst->Sampler, map[ inst->Sampler ]); - */ + inst->TexSrcUnit, samplerMap[ inst->TexSrcUnit ]); +#endif + /* here, texUnit is really samplerUnit */ - const GLint oldSampNum = inst->TexSrcUnit; if (oldSampNum < Elements(samplerMap)) { const GLuint newSampNum = samplerMap[oldSampNum]; inst->TexSrcUnit = newSampNum; |