diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-06 09:05:10 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-09 15:00:17 -0800 |
| commit | ee85014b90af1d94d637ec763a803479e9bac5dc (patch) | |
| tree | 91a7aea9be51e8c18b18f40f237175e9471e0d41 /src/mesa/program/prog_to_nir.c | |
| parent | 3f421849945d763b3e477ceb1c726c2dbed3bafd (diff) | |
nir/tex_instr: Rename sampler to texture
We're about to separate the two concepts. When we do, the sampler will
become optional. Doing a rename first makes the separation a bit more
safe because drivers that depend on GLSL or TGSI behaviour will be fine to
just use the texture index all the time.
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/program/prog_to_nir.c')
| -rw-r--r-- | src/mesa/program/prog_to_nir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index 29e5d3075c9..93a167e0aa1 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/src/mesa/program/prog_to_nir.c @@ -609,7 +609,7 @@ ptn_tex(nir_builder *b, nir_alu_dest dest, nir_ssa_def **src, instr->op = op; instr->dest_type = nir_type_float; instr->is_shadow = prog_inst->TexShadow; - instr->sampler_index = prog_inst->TexSrcUnit; + instr->texture_index = prog_inst->TexSrcUnit; switch (prog_inst->TexSrcTarget) { case TEXTURE_1D_INDEX: |