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>
This commit is contained in:
Jason Ekstrand
2016-02-06 09:05:10 -08:00
parent 3f42184994
commit ee85014b90
18 changed files with 95 additions and 95 deletions

View File

@@ -1852,7 +1852,7 @@ nir_visitor::visit(ir_texture *ir)
unreachable("not reached");
}
instr->sampler = evaluate_deref(&instr->instr, ir->sampler);
instr->texture = evaluate_deref(&instr->instr, ir->sampler);
unsigned src_number = 0;