diff options
author | Brian Paul <[email protected]> | 2009-01-14 11:58:45 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2009-01-14 11:58:45 -0700 |
commit | b5f89e5f17bdf718d1f1f29e7a10dee3809c9f29 (patch) | |
tree | abedcbb279e20649a56707f41c857f9891841bd1 /src/mesa/shader/slang/slang_emit.c | |
parent | c12d24b513a67648c30bf892964f887fad71e103 (diff) |
glsl: simplify IR storage for samplers
Don't overload the Size field with the texture target, to avoid confusion.
Diffstat (limited to 'src/mesa/shader/slang/slang_emit.c')
-rw-r--r-- | src/mesa/shader/slang/slang_emit.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c index 08b7d519a57..414d3e639bf 100644 --- a/src/mesa/shader/slang/slang_emit.c +++ b/src/mesa/shader/slang/slang_emit.c @@ -1300,14 +1300,10 @@ emit_tex(slang_emit_info *emitInfo, slang_ir_node *n) NULL, NULL); - /* Store->Index is the sampler index */ + /* Store->Index is the uniform/sampler index */ assert(n->Children[0]->Store->Index >= 0); - /* Store->Size is the texture target */ - assert(n->Children[0]->Store->Size >= TEXTURE_1D_INDEX); - assert(n->Children[0]->Store->Size <= TEXTURE_RECT_INDEX); - - inst->TexSrcTarget = n->Children[0]->Store->Size; - inst->TexSrcUnit = n->Children[0]->Store->Index; /* i.e. uniform's index */ + inst->TexSrcUnit = n->Children[0]->Store->Index; + inst->TexSrcTarget = n->Children[0]->Store->TexTarget; /* mark the sampler as being used */ _mesa_use_uniform(emitInfo->prog->Parameters, |