From 164ccd27787e0df4ae6f85a7178aff0720d56ac9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 5 Aug 2011 19:12:16 -0700 Subject: [PATCH] i965/vs: Fix support for "IF" instructions by copying brw_fs_visitor.cpp. Fixes glsl-vs-if-greater. --- src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp index c3b55db..014f7e6 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp @@ -1451,12 +1451,18 @@ vec4_visitor::visit(ir_discard *ir) void vec4_visitor::visit(ir_if *ir) { + /* Don't point the annotation at the if statement, because then it plus + * the then and else blocks get printed. + */ this->base_ir = ir->condition; - ir->condition->accept(this); - assert(this->result.file != BAD_FILE); - /* FINISHME: condcode */ - emit(BRW_OPCODE_IF); + if (intel->gen == 6) { + emit_if_gen6(ir); + } else { + emit_bool_to_cond_code(ir->condition); + vec4_instruction *inst = emit(BRW_OPCODE_IF); + inst->predicate = BRW_PREDICATE_NORMAL; + } visit_instructions(&ir->then_instructions); -- 2.7.4