From 4bfa2ac2eab7551b1d89309fa8da44a487542f72 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Fri, 18 May 2018 15:13:25 -0700 Subject: [PATCH] intel/fs: Rename a local variable so it doesn't shadow component() v2 (Jason Ekstrand): - Break the refactor into its own patch Reviewed-by: Jason Ekstrand Reviewed-by: Kenneth Graunke Reviewed-by: Matt Turner --- src/intel/compiler/brw_fs_nir.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index 1ce8952..ad945b8 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -3372,15 +3372,15 @@ fs_visitor::nir_emit_fs_intrinsic(const fs_builder &bld, case nir_intrinsic_load_input: { /* load_input is only used for flat inputs */ unsigned base = nir_intrinsic_base(instr); - unsigned component = nir_intrinsic_component(instr); + unsigned comp = nir_intrinsic_component(instr); unsigned num_components = instr->num_components; enum brw_reg_type type = dest.type; /* Special case fields in the VUE header */ if (base == VARYING_SLOT_LAYER) - component = 1; + comp = 1; else if (base == VARYING_SLOT_VIEWPORT) - component = 2; + comp = 2; if (nir_dest_bit_size(instr->dest) == 64) { /* const_index is in 32-bit type size units that could not be aligned @@ -3392,7 +3392,7 @@ fs_visitor::nir_emit_fs_intrinsic(const fs_builder &bld, } for (unsigned int i = 0; i < num_components; i++) { - struct brw_reg interp = interp_reg(base, component + i); + struct brw_reg interp = interp_reg(base, comp + i); interp = suboffset(interp, 3); bld.emit(FS_OPCODE_CINTERP, offset(retype(dest, type), bld, i), retype(fs_reg(interp), type)); -- 2.7.4