Add bool/int conversion as IR operations.
Fixes constructor-09.glsl and CorrectParse2.frag.
This commit is contained in:
parent
dc58b3f8cc
commit
c2cb84e17b
|
@ -130,7 +130,7 @@ convert_component(ir_rvalue *src, const glsl_type *desired_type)
|
|||
return new ir_expression(ir_unop_f2i, desired_type, src, NULL);
|
||||
else {
|
||||
assert(b == GLSL_TYPE_BOOL);
|
||||
assert(!"FINISHME: Convert bool to int / uint.");
|
||||
return new ir_expression(ir_unop_f2b, desired_type, src, NULL);
|
||||
}
|
||||
case GLSL_TYPE_FLOAT:
|
||||
switch (b) {
|
||||
|
|
2
ir.cpp
2
ir.cpp
|
@ -66,6 +66,8 @@ ir_expression::get_num_operands(void)
|
|||
1, /* ir_unop_i2f */
|
||||
1, /* ir_unop_f2b */
|
||||
1, /* ir_unop_b2f */
|
||||
1, /* ir_unop_i2b */
|
||||
1, /* ir_unop_b2i */
|
||||
1, /* ir_unop_u2f */
|
||||
|
||||
1, /* ir_unop_trunc */
|
||||
|
|
2
ir.h
2
ir.h
|
@ -318,6 +318,8 @@ enum ir_expression_operation {
|
|||
ir_unop_i2f, /**< Integer-to-float conversion. */
|
||||
ir_unop_f2b, /**< Float-to-boolean conversion */
|
||||
ir_unop_b2f, /**< Boolean-to-float conversion */
|
||||
ir_unop_i2b, /**< int-to-boolean conversion */
|
||||
ir_unop_b2i, /**< Boolean-to-int conversion */
|
||||
ir_unop_u2f, /**< Unsigned-to-float conversion. */
|
||||
|
||||
/**
|
||||
|
|
|
@ -102,6 +102,8 @@ void ir_print_visitor::visit(ir_expression *ir)
|
|||
"i2f",
|
||||
"f2b",
|
||||
"b2f",
|
||||
"i2b",
|
||||
"b2i",
|
||||
"u2f",
|
||||
"trunc",
|
||||
"ceil",
|
||||
|
|
Loading…
Reference in New Issue