diff options
| author | Jason Ekstrand <[email protected]> | 2014-12-05 11:03:06 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-01-15 07:20:21 -0800 |
| commit | cd4b995254fe29bae9ab5a9563cc615274d361ed (patch) | |
| tree | 4969c948b76d97529963ecac138a8d6d95e07d21 /src/glsl/nir/nir.c | |
| parent | d6fe35a418426c811398a32b9aeacf7410f6352d (diff) | |
nir: Make texture instruction names more consistent
This commit renames nir_instr_as_texture to nir_instr_as_tex and renames
nir_instr_type_texture to nir_instr_type_tex to be consistent with
nir_tex_instr.
Reviewed-by: Connor Abbott <[email protected]>
Diffstat (limited to 'src/glsl/nir/nir.c')
| -rw-r--r-- | src/glsl/nir/nir.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index c376de1cf19..e9035d449c3 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -456,7 +456,7 @@ nir_tex_instr * nir_tex_instr_create(void *mem_ctx, unsigned num_srcs) { nir_tex_instr *instr = ralloc(mem_ctx, nir_tex_instr); - instr_init(&instr->instr, nir_instr_type_texture); + instr_init(&instr->instr, nir_instr_type_tex); dest_init(&instr->dest); @@ -1453,8 +1453,8 @@ nir_foreach_dest(nir_instr *instr, nir_foreach_dest_cb cb, void *state) return visit_alu_dest(nir_instr_as_alu(instr), cb, state); case nir_instr_type_intrinsic: return visit_intrinsic_dest(nir_instr_as_intrinsic(instr), cb, state); - case nir_instr_type_texture: - return visit_texture_dest(nir_instr_as_texture(instr), cb, state); + case nir_instr_type_tex: + return visit_texture_dest(nir_instr_as_tex(instr), cb, state); case nir_instr_type_load_const: return visit_load_const_dest(nir_instr_as_load_const(instr), cb, state); case nir_instr_type_phi: @@ -1636,8 +1636,8 @@ nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state) if (!visit_intrinsic_src(nir_instr_as_intrinsic(instr), cb, state)) return false; break; - case nir_instr_type_texture: - if (!visit_tex_src(nir_instr_as_texture(instr), cb, state)) + case nir_instr_type_tex: + if (!visit_tex_src(nir_instr_as_tex(instr), cb, state)) return false; break; case nir_instr_type_call: |