diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-06 09:05:10 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-02-09 15:00:17 -0800 |
| commit | ee85014b90af1d94d637ec763a803479e9bac5dc (patch) | |
| tree | 91a7aea9be51e8c18b18f40f237175e9471e0d41 /src/compiler/nir/nir_print.c | |
| parent | 3f421849945d763b3e477ceb1c726c2dbed3bafd (diff) | |
| download | external_mesa3d-ee85014b90af1d94d637ec763a803479e9bac5dc.zip external_mesa3d-ee85014b90af1d94d637ec763a803479e9bac5dc.tar.gz external_mesa3d-ee85014b90af1d94d637ec763a803479e9bac5dc.tar.bz2 | |
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 <kenneth@whitecape.org>
Diffstat (limited to 'src/compiler/nir/nir_print.c')
| -rw-r--r-- | src/compiler/nir/nir_print.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index 4ec32cf..5e7ae82 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -622,8 +622,8 @@ print_tex_instr(nir_tex_instr *instr, print_state *state) case nir_tex_src_ddy: fprintf(fp, "(ddy)"); break; - case nir_tex_src_sampler_offset: - fprintf(fp, "(sampler_offset)"); + case nir_tex_src_texture_offset: + fprintf(fp, "(texture_offset)"); break; default: @@ -652,13 +652,13 @@ print_tex_instr(nir_tex_instr *instr, print_state *state) fprintf(fp, "%u (gather_component), ", instr->component); } - if (instr->sampler) { - print_deref(instr->sampler, state); + if (instr->texture) { + print_deref(instr->texture, state); } else { - fprintf(fp, "%u", instr->sampler_index); + fprintf(fp, "%u", instr->texture_index); } - fprintf(fp, " (sampler)"); + fprintf(fp, " (texture)"); } static void |