-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 04/17/2011 11:39 PM, Bryan Cain wrote:
This one looks good. Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> Since I don't think you have commit access, so I'll go ahead and commit this. > --- > src/glsl/ir_validate.cpp | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp > index f3fceb2..41ffdfd 100644 > --- a/src/glsl/ir_validate.cpp > +++ b/src/glsl/ir_validate.cpp > @@ -254,7 +254,7 @@ ir_validate::visit_leave(ir_expression *ir) > > case ir_unop_f2i: > assert(ir->operands[0]->type->base_type == GLSL_TYPE_FLOAT); > - assert(ir->type->base_type == GLSL_TYPE_INT); > + assert(ir->type->is_integer()); > break; > case ir_unop_i2f: > assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT); > @@ -269,12 +269,12 @@ ir_validate::visit_leave(ir_expression *ir) > assert(ir->type->base_type == GLSL_TYPE_FLOAT); > break; > case ir_unop_i2b: > - assert(ir->operands[0]->type->base_type == GLSL_TYPE_INT); > + assert(ir->operands[0]->type->is_integer()); > assert(ir->type->base_type == GLSL_TYPE_BOOL); > break; > case ir_unop_b2i: > assert(ir->operands[0]->type->base_type == GLSL_TYPE_BOOL); > - assert(ir->type->base_type == GLSL_TYPE_INT); > + assert(ir->type->is_integer()); > break; > case ir_unop_u2f: > assert(ir->operands[0]->type->base_type == GLSL_TYPE_UINT); -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/ iEYEARECAAYFAk2sw/AACgkQX1gOwKyEAw/V8ACfZpgegIx/0shFCBDYbR0VR3py HqUAn3VlhrdZCQK69VrY5HQ8xdL/fiEw =CW1w -----END PGP SIGNATURE----- _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
