fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Avoid name clash of loop counter and member

Browse source 
src/mesa/drivers/dri/i965/brw_fs.cpp:565 warning: name lookup of ‘c’ changed

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-03-29 15:39:01 +01:00
parent b094dff50a
commit 252eaa765e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -547,16 +547,16 @@ fs_visitor::emit_general_interpolation(ir_variable *ir)
* handed us defined values in only the constant offset * handed us defined values in only the constant offset
* field of the setup reg. * field of the setup reg.
*/ */
for (unsigned int c = 0; c < type->vector_elements; c++) { for (unsigned int k = 0; k < type->vector_elements; k++) {
struct brw_reg interp = interp_reg(location, c); struct brw_reg interp = interp_reg(location, k);
interp = suboffset(interp, 3); interp = suboffset(interp, 3);
emit(FS_OPCODE_CINTERP, attr, fs_reg(interp)); emit(FS_OPCODE_CINTERP, attr, fs_reg(interp));
attr.reg_offset++; attr.reg_offset++;
} }
} else { } else {
/* Perspective interpolation case. */ /* Perspective interpolation case. */
for (unsigned int c = 0; c < type->vector_elements; c++) { for (unsigned int k = 0; k < type->vector_elements; k++) {
struct brw_reg interp = interp_reg(location, c); struct brw_reg interp = interp_reg(location, k);
emit(FS_OPCODE_LINTERP, attr, emit(FS_OPCODE_LINTERP, attr,
this->delta_x, this->delta_y, fs_reg(interp)); this->delta_x, this->delta_y, fs_reg(interp));
attr.reg_offset++; attr.reg_offset++;
@ -564,7 +564,7 @@ fs_visitor::emit_general_interpolation(ir_variable *ir)
if (intel->gen < 6 && !(is_gl_Color && c->key.linear_color)) { if (intel->gen < 6 && !(is_gl_Color && c->key.linear_color)) {
attr.reg_offset -= type->vector_elements; attr.reg_offset -= type->vector_elements;
for (unsigned int c = 0; c < type->vector_elements; c++) { for (unsigned int k = 0; k < type->vector_elements; k++) {
emit(BRW_OPCODE_MUL, attr, attr, this->pixel_w); emit(BRW_OPCODE_MUL, attr, attr, this->pixel_w);
attr.reg_offset++; attr.reg_offset++;
} }