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

glsl: fix signed/unsigned comparision warnings on MSVC

Browse Source 
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2012-11-04 16:43:44 -07:00
parent 78d3cfb5b4
commit ab8c5347f1
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/glsl/lower_mat_op_to_vec.cpp
View File

@@ -122,7 +122,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_mat(ir_dereference *result,
ir_dereference *a, ir_dereference *a,
ir_dereference *b) ir_dereference *b)
{ {
int b_col, i; unsigned b_col, i;
ir_assignment *assign; ir_assignment *assign;
ir_expression *expr; ir_expression *expr;
@@ -154,7 +154,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_vec(ir_dereference *result,
ir_dereference *a, ir_dereference *a,
ir_dereference *b) ir_dereference *b)
{ {
int i; unsigned i;
ir_assignment *assign; ir_assignment *assign;
ir_expression *expr; ir_expression *expr;
@@ -183,7 +183,7 @@ ir_mat_op_to_vec_visitor::do_mul_vec_mat(ir_dereference *result,
ir_dereference *a, ir_dereference *a,
ir_dereference *b) ir_dereference *b)
{ {
int i; unsigned i;
for (i = 0; i < b->type->matrix_columns; i++) { for (i = 0; i < b->type->matrix_columns; i++) {
ir_rvalue *column_result; ir_rvalue *column_result;
@@ -208,7 +208,7 @@ ir_mat_op_to_vec_visitor::do_mul_mat_scalar(ir_dereference *result,
ir_dereference *a, ir_dereference *a,
ir_dereference *b) ir_dereference *b)
{ {
int i; unsigned i;
for (i = 0; i < a->type->matrix_columns; i++) { for (i = 0; i < a->type->matrix_columns; i++) {
ir_expression *column_expr; ir_expression *column_expr;

4
src/glsl/lower_vec_index_to_cond_assign.cpp
View File

@@ -71,7 +71,7 @@ ir_vec_index_to_cond_assign_visitor::convert_vec_index_to_cond_assign(ir_rvalue
ir_assignment *assign; ir_assignment *assign;
ir_variable *index, *var; ir_variable *index, *var;
ir_dereference *deref; ir_dereference *deref;
int i; unsigned i;
if (!orig_deref) if (!orig_deref)
return ir; return ir;
@@ -164,7 +164,7 @@ ir_vec_index_to_cond_assign_visitor::visit_leave(ir_assignment *ir)
ir_variable *index, *var; ir_variable *index, *var;
ir_dereference_variable *deref; ir_dereference_variable *deref;
ir_assignment *assign; ir_assignment *assign;
int i; unsigned i;
ir->rhs = convert_vec_index_to_cond_assign(ir->rhs); ir->rhs = convert_vec_index_to_cond_assign(ir->rhs);
if (ir->condition) if (ir->condition)

2
src/glsl/lower_vec_index_to_swizzle.cpp
View File

@@ -93,7 +93,7 @@ ir_vec_index_to_swizzle_visitor::convert_vec_index_to_swizzle(ir_rvalue *ir)
* large. For simplicity sake, just clamp the index to [0, size-1]. * large. For simplicity sake, just clamp the index to [0, size-1].
*/ */
const int i = MIN2(MAX2(ir_constant->value.i[0], 0), const int i = MIN2(MAX2(ir_constant->value.i[0], 0),
(deref->array->type->vector_elements - 1)); ((int) deref->array->type->vector_elements - 1));
return new(ctx) ir_swizzle(deref->array, i, 0, 0, 0, 1); return new(ctx) ir_swizzle(deref->array, i, 0, 0, 0, 1);
} }