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/gallium/drivers/vc4/vc4_program.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/gallium/drivers/vc4/vc4_program.c')
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_program.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index 7db1b03cbc1..5c91c02b539 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -296,7 +296,7 @@ ntq_emit_txf(struct vc4_compile *c, nir_tex_instr *instr) uint32_t tile_size = (tile_height * tile_width * VC4_MAX_SAMPLES * sizeof(uint32_t)); - unsigned unit = instr->sampler_index; + unsigned unit = instr->texture_index; uint32_t w = align(c->key->tex[unit].msaa_width, tile_width); uint32_t w_tiles = w / tile_width; uint32_t h = align(c->key->tex[unit].msaa_height, tile_height); @@ -339,7 +339,7 @@ ntq_emit_tex(struct vc4_compile *c, nir_tex_instr *instr) { struct qreg s, t, r, lod, proj, compare; bool is_txb = false, is_txl = false, has_proj = false; - unsigned unit = instr->sampler_index; + unsigned unit = instr->texture_index; if (instr->op == nir_texop_txf) { ntq_emit_txf(c, instr); |