diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2014-12-05 11:03:06 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-01-15 07:20:21 -0800 |
| commit | cd4b995254fe29bae9ab5a9563cc615274d361ed (patch) | |
| tree | 4969c948b76d97529963ecac138a8d6d95e07d21 /src/glsl/nir/nir.h | |
| 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 <cwabbott0@gmail.com>
Diffstat (limited to 'src/glsl/nir/nir.h')
| -rw-r--r-- | src/glsl/nir/nir.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h index 0c21dca6ba..ecd174a88a 100644 --- a/src/glsl/nir/nir.h +++ b/src/glsl/nir/nir.h @@ -405,7 +405,7 @@ typedef struct { typedef enum { nir_instr_type_alu, nir_instr_type_call, - nir_instr_type_texture, + nir_instr_type_tex, nir_instr_type_intrinsic, nir_instr_type_load_const, nir_instr_type_jump, @@ -993,7 +993,7 @@ typedef struct { NIR_DEFINE_CAST(nir_instr_as_alu, nir_instr, nir_alu_instr, instr) NIR_DEFINE_CAST(nir_instr_as_call, nir_instr, nir_call_instr, instr) NIR_DEFINE_CAST(nir_instr_as_jump, nir_instr, nir_jump_instr, instr) -NIR_DEFINE_CAST(nir_instr_as_texture, nir_instr, nir_tex_instr, instr) +NIR_DEFINE_CAST(nir_instr_as_tex, nir_instr, nir_tex_instr, instr) NIR_DEFINE_CAST(nir_instr_as_intrinsic, nir_instr, nir_intrinsic_instr, instr) NIR_DEFINE_CAST(nir_instr_as_load_const, nir_instr, nir_load_const_instr, instr) NIR_DEFINE_CAST(nir_instr_as_ssa_undef, nir_instr, nir_ssa_undef_instr, instr) |