<div dir="ltr">Hi Jose,<br><br>This looks good to me.<br><br>Marek<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Apr 16, 2013 at 10:11 PM, Jose Fonseca <span dir="ltr"><<a href="mailto:jfonseca@vmware.com" target="_blank">jfonseca@vmware.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">----- Original Message -----<br>
> The R600 code looks good.<br>
><br>
> Marek<br>
><br>
><br>
<br>
</div>When I rebased on top of master, I had a conflict on r600. Below is how I resolved. Please confirm you're OK with it.<br>
<br>
Jose<br>
<br>
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c<br>
index f3e2187..5ac8c09 100644<br>
--- a/src/gallium/drivers/r600/r600_shader.c<br>
+++ b/src/gallium/drivers/r600/r600_shader.c<br>
@@ -5728,7 +5728,7 @@ static void break_loop_on_flag(struct r600_shader_ctx *ctx, unsigned fc_sp)<br>
}<br>
#endif<br>
<br>
-static int tgsi_if(struct r600_shader_ctx *ctx)<br>
+static int emit_if(struct r600_shader_ctx *ctx, int opcode)<br>
{<br>
int alu_type = CF_OP_ALU_PUSH_BEFORE;<br>
<br>
@@ -5742,7 +5742,7 @@ static int tgsi_if(struct r600_shader_ctx *ctx)<br>
alu_type = CF_OP_ALU;<br>
}<br>
<br>
- emit_logic_pred(ctx, ALU_OP2_PRED_SETNE_INT, alu_type);<br>
+ emit_logic_pred(ctx, opcode, alu_type);<br>
<br>
r600_bytecode_add_cfinst(ctx->bc, CF_OP_JUMP);<br>
<br>
@@ -5752,6 +5752,16 @@ static int tgsi_if(struct r600_shader_ctx *ctx)<br>
return 0;<br>
}<br>
<br>
+static int tgsi_if(struct r600_shader_ctx *ctx)<br>
+{<br>
+ return emit_if(ctx, ALU_OP2_PRED_SETNE);<br>
<div class="im">+}<br>
+<br>
+static int tgsi_uif(struct r600_shader_ctx *ctx)<br>
+{<br>
</div>+ return emit_if(ctx, ALU_OP2_PRED_SETNE_INT);<br>
+}<br>
+<br>
static int tgsi_else(struct r600_shader_ctx *ctx)<br>
{<br>
r600_bytecode_add_cfinst(ctx->bc, CF_OP_ELSE);<br>
<br>
<br>
</blockquote></div><br></div>