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_remove_dead_variables.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 <kenneth@whitecape.org>
Diffstat (limited to 'src/compiler/nir/nir_remove_dead_variables.c')
| -rw-r--r-- | src/compiler/nir/nir_remove_dead_variables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c index db754e56b1c..24bae46c7fc 100644 --- a/src/compiler/nir/nir_remove_dead_variables.c +++ b/src/compiler/nir/nir_remove_dead_variables.c @@ -54,8 +54,8 @@ add_var_use_call(nir_call_instr *instr, struct set *live) static void add_var_use_tex(nir_tex_instr *instr, struct set *live) { - if (instr->sampler != NULL) { - nir_variable *var = instr->sampler->var; + if (instr->texture != NULL) { + nir_variable *var = instr->texture->var; _mesa_set_add(live, var); } } |