OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir_constant_expression: Declare loop counting variables in the loops.

Browse Source 
Fixes "name lookup of 'c' changed" warning.
This commit is contained in:
Kenneth Graunke
2010-07-06 16:26:11 -07:00
committed by Ian Romanick
parent f2dfac6d74
commit f14e596f11
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/glsl/ir_constant_expression.cpp
View File

@@ -130,12 +130,11 @@ ir_constant_visitor::visit(ir_expression *ir)
{ {
value = NULL; value = NULL;
ir_constant *op[2] = { NULL, NULL }; ir_constant *op[2] = { NULL, NULL };
unsigned int operand, c;
ir_constant_data data; ir_constant_data data;
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
for (operand = 0; operand < ir->get_num_operands(); operand++) { for (unsigned operand = 0; operand < ir->get_num_operands(); operand++) {
op[operand] = ir->operands[operand]->constant_expression_value(); op[operand] = ir->operands[operand]->constant_expression_value();
if (!op[operand]) if (!op[operand])
return; return;
@@ -157,20 +156,20 @@ ir_constant_visitor::visit(ir_expression *ir)
switch (ir->operation) { switch (ir->operation) {
case ir_unop_logic_not: case ir_unop_logic_not:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
for (c = 0; c < ir->operands[0]->type->components(); c++) for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
data.b[c] = !op[0]->value.b[c]; data.b[c] = !op[0]->value.b[c];
break; break;
case ir_unop_f2i: case ir_unop_f2i:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.i[c] = op[0]->value.f[c]; data.i[c] = op[0]->value.f[c];
} }
break; break;
case ir_unop_i2f: case ir_unop_i2f:
assert(op[0]->type->base_type == GLSL_TYPE_UINT || assert(op[0]->type->base_type == GLSL_TYPE_UINT ||
op[0]->type->base_type == GLSL_TYPE_INT); op[0]->type->base_type == GLSL_TYPE_INT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
if (op[0]->type->base_type == GLSL_TYPE_INT) if (op[0]->type->base_type == GLSL_TYPE_INT)
data.f[c] = op[0]->value.i[c]; data.f[c] = op[0]->value.i[c];
else else
@@ -179,31 +178,31 @@ ir_constant_visitor::visit(ir_expression *ir)
break; break;
case ir_unop_b2f: case ir_unop_b2f:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.f[c] = op[0]->value.b[c] ? 1.0 : 0.0; data.f[c] = op[0]->value.b[c] ? 1.0 : 0.0;
} }
break; break;
case ir_unop_f2b: case ir_unop_f2b:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.b[c] = bool(op[0]->value.f[c]); data.b[c] = bool(op[0]->value.f[c]);
} }
break; break;
case ir_unop_b2i: case ir_unop_b2i:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.u[c] = op[0]->value.b[c] ? 1 : 0; data.u[c] = op[0]->value.b[c] ? 1 : 0;
} }
break; break;
case ir_unop_i2b: case ir_unop_i2b:
assert(op[0]->type->is_integer()); assert(op[0]->type->is_integer());
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.b[c] = bool(op[0]->value.u[c]); data.b[c] = bool(op[0]->value.u[c]);
} }
break; break;
case ir_unop_fract: case ir_unop_fract:
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->type->base_type) { switch (ir->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.u[c] = 0; data.u[c] = 0;
@@ -221,7 +220,7 @@ ir_constant_visitor::visit(ir_expression *ir)
break; break;
case ir_unop_neg: case ir_unop_neg:
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->type->base_type) { switch (ir->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.u[c] = -op[0]->value.u[c]; data.u[c] = -op[0]->value.u[c];
@@ -240,7 +239,7 @@ ir_constant_visitor::visit(ir_expression *ir)
case ir_unop_abs: case ir_unop_abs:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->type->base_type) { switch (ir->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.u[c] = op[0]->value.u[c]; data.u[c] = op[0]->value.u[c];
@@ -261,7 +260,7 @@ ir_constant_visitor::visit(ir_expression *ir)
case ir_unop_rcp: case ir_unop_rcp:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->type->base_type) { switch (ir->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
if (op[0]->value.u[c] != 0.0) if (op[0]->value.u[c] != 0.0)
@@ -283,28 +282,28 @@ ir_constant_visitor::visit(ir_expression *ir)
case ir_unop_rsq: case ir_unop_rsq:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.f[c] = 1.0 / sqrtf(op[0]->value.f[c]); data.f[c] = 1.0 / sqrtf(op[0]->value.f[c]);
} }
break; break;
case ir_unop_sqrt: case ir_unop_sqrt:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.f[c] = sqrtf(op[0]->value.f[c]); data.f[c] = sqrtf(op[0]->value.f[c]);
} }
break; break;
case ir_unop_exp: case ir_unop_exp:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.f[c] = expf(op[0]->value.f[c]); data.f[c] = expf(op[0]->value.f[c]);
} }
break; break;
case ir_unop_log: case ir_unop_log:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.f[c] = logf(op[0]->value.f[c]); data.f[c] = logf(op[0]->value.f[c]);
} }
break; break;
@@ -312,7 +311,7 @@ ir_constant_visitor::visit(ir_expression *ir)
case ir_unop_dFdx: case ir_unop_dFdx:
case ir_unop_dFdy: case ir_unop_dFdy:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT); assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
data.f[c] = 0.0; data.f[c] = 0.0;
} }
break; break;
@@ -320,7 +319,7 @@ ir_constant_visitor::visit(ir_expression *ir)
case ir_binop_dot: case ir_binop_dot:
assert(op[0]->type->is_vector() && op[1]->type->is_vector()); assert(op[0]->type->is_vector() && op[1]->type->is_vector());
data.f[0] = 0; data.f[0] = 0;
for (c = 0; c < op[0]->type->components(); c++) { for (unsigned c = 0; c < op[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) { switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.u[0] += op[0]->value.u[c] * op[1]->value.u[c]; data.u[0] += op[0]->value.u[c] * op[1]->value.u[c];
@@ -453,17 +452,17 @@ ir_constant_visitor::visit(ir_expression *ir)
break; break;
case ir_binop_logic_and: case ir_binop_logic_and:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
for (c = 0; c < ir->operands[0]->type->components(); c++) for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
data.b[c] = op[0]->value.b[c] && op[1]->value.b[c]; data.b[c] = op[0]->value.b[c] && op[1]->value.b[c];
break; break;
case ir_binop_logic_xor: case ir_binop_logic_xor:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
for (c = 0; c < ir->operands[0]->type->components(); c++) for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
data.b[c] = op[0]->value.b[c] ^ op[1]->value.b[c]; data.b[c] = op[0]->value.b[c] ^ op[1]->value.b[c];
break; break;
case ir_binop_logic_or: case ir_binop_logic_or:
assert(op[0]->type->base_type == GLSL_TYPE_BOOL); assert(op[0]->type->base_type == GLSL_TYPE_BOOL);
for (c = 0; c < ir->operands[0]->type->components(); c++) for (unsigned c = 0; c < ir->operands[0]->type->components(); c++)
data.b[c] = op[0]->value.b[c] || op[1]->value.b[c]; data.b[c] = op[0]->value.b[c] || op[1]->value.b[c];
break; break;
@@ -530,7 +529,7 @@ ir_constant_visitor::visit(ir_expression *ir)
case ir_binop_equal: case ir_binop_equal:
data.b[0] = true; data.b[0] = true;
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) { switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.b[0] = data.b[0] && op[0]->value.u[c] == op[1]->value.u[c]; data.b[0] = data.b[0] && op[0]->value.u[c] == op[1]->value.u[c];
@@ -551,7 +550,7 @@ ir_constant_visitor::visit(ir_expression *ir)
break; break;
case ir_binop_nequal: case ir_binop_nequal:
data.b[0] = false; data.b[0] = false;
for (c = 0; c < ir->operands[0]->type->components(); c++) { for (unsigned c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->operands[0]->type->base_type) { switch (ir->operands[0]->type->base_type) {
case GLSL_TYPE_UINT: case GLSL_TYPE_UINT:
data.b[0] = data.b[0] || op[0]->value.u[c] != op[1]->value.u[c]; data.b[0] = data.b[0] || op[0]->value.u[c] != op[1]->value.u[c];