diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-10-26 19:19:09 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-10-26 19:19:51 -0600 |
| commit | 8fed2466e4056668a76a87cf935b5fbff8ae15ca (patch) | |
| tree | 81345e5b5ee66dc2dd299f5b9ce29314f2e52735 /src/mesa/shader/prog_instruction.h | |
| parent | 789d248558061fe4d65f664d6770a12b90fa2e34 (diff) | |
Re-implement GLSL texture sampler variables.
GLSL sampler variables indicate which texture unit to use for TEX instructions.
Previously, this was baked into the fragment/vertex program and couldn't be
readily changed once set.
Now, SamplerUnits[] array indicates which texture unit is to be used for
each sampler variable. These values are set with glUniform1i().
This is extra state that must be passed to the fragment/vertex program
executor at runtime.
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 643969b367..e8a2407ea8 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -413,11 +413,13 @@ struct prog_instruction */ GLint BranchTarget; +#if 0 /** * For TEX instructions in shaders, the sampler to use for the * texture lookup. */ GLint Sampler; +#endif const char *Comment; }; @@ -443,6 +445,9 @@ _mesa_num_inst_src_regs(gl_inst_opcode opcode); extern GLuint _mesa_num_inst_dst_regs(gl_inst_opcode opcode); +extern GLboolean +_mesa_is_tex_instruction(gl_inst_opcode opcode); + extern const char * _mesa_opcode_string(gl_inst_opcode opcode); |