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/compiler/nir/glsl_to_nir.cpp | |
| 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/compiler/nir/glsl_to_nir.cpp')
| -rw-r--r-- | src/compiler/nir/glsl_to_nir.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/nir/glsl_to_nir.cpp b/src/compiler/nir/glsl_to_nir.cpp index 68b7aebbc37..ee1a0cb9348 100644 --- a/src/compiler/nir/glsl_to_nir.cpp +++ b/src/compiler/nir/glsl_to_nir.cpp @@ -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; |