summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang/slang_link2.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-01-08 15:58:14 -0700
committerBrian <brian@yutani.localnet.net>2007-01-08 15:58:14 -0700
commit42153d7858686cfd88e919c0889a56d3a13a603e (patch)
tree3fe760df42a2f1eb963866b6bbb86dc98525fd37 /src/mesa/shader/slang/slang_link2.c
parent483ca39bca3c4a125e725e4711abde3f86a84b9e (diff)
Implement projective texture sampling, 3D textures. Disable some debug output.
Diffstat (limited to 'src/mesa/shader/slang/slang_link2.c')
-rw-r--r--src/mesa/shader/slang/slang_link2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/shader/slang/slang_link2.c b/src/mesa/shader/slang/slang_link2.c
index 8b59d7f76a..3a5bce0099 100644
--- a/src/mesa/shader/slang/slang_link2.c
+++ b/src/mesa/shader/slang/slang_link2.c
@@ -257,7 +257,7 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
if (inst->Opcode == OPCODE_TEX ||
inst->Opcode == OPCODE_TXB ||
- inst->Opcode == OPCODE_TXB) {
+ inst->Opcode == OPCODE_TXP) {
printf("====== remap sampler from %d to %d\n",
inst->Sampler, map[ inst->Sampler ]);
inst->Sampler = map[ inst->Sampler ];
@@ -328,7 +328,7 @@ _slang_resolve_samplers(struct gl_shader_program *shProg,
struct prog_instruction *inst = prog->Instructions + i;
if (inst->Opcode == OPCODE_TEX ||
inst->Opcode == OPCODE_TXB ||
- inst->Opcode == OPCODE_TXB) {
+ inst->Opcode == OPCODE_TXP) {
GLint sampleUnit = (GLint) shProg->Uniforms->ParameterValues[inst->Sampler][0];
assert(sampleUnit < MAX_TEXTURE_IMAGE_UNITS);
inst->TexSrcUnit = sampleUnit;