print BRA instructions

diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index b34bbbd4821df86c500f8956e31012cdfadd0fea..7e2e1b22c4b7e1fbeec0b0440e2bc8ba5ee47e45 100644 (file)
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -77,6 +77,9 @@ program_file_string(enum register_file f)
 /**
  * Return a string representation of the given swizzle word.
  * If extended is true, use extended (comma-separated) format.
+ * \param swizzle  the swizzle field
+ * \param negateBase  4-bit negation vector
+ * \param extended  if true, also allow 0, 1 values
  */
 static const char *
 swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended)
@@ -147,6 +150,25 @@ writemask_string(GLuint writeMask)
    return s;
 }
 
+
+static const char *
+condcode_string(GLuint condcode)
+{
+   switch (condcode) {
+   case COND_GT:  return "GT";
+   case COND_EQ:  return "EQ";
+   case COND_LT:  return "LT";
+   case COND_UN:  return "UN";
+   case COND_GE:  return "GE";
+   case COND_LE:  return "LE";
+   case COND_NE:  return "NE";
+   case COND_TR:  return "TR";
+   case COND_FL:  return "FL";
+   default: return "cond???";
+   }
+}
+
+
 static void
 print_dst_reg(const struct prog_dst_register *dstReg)
 {
@@ -273,7 +295,10 @@ _mesa_print_instruction(const struct prog_instruction *inst)
       print_comment(inst);
       break;
    case OPCODE_BRA:
-      _mesa_printf("BRA %u", inst->BranchTarget);
+      _mesa_printf("BRA %u (%s.%s)",
+                   inst->BranchTarget,
+                   condcode_string(inst->DstReg.CondMask),
+                   swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
       print_comment(inst);
       break;
    case OPCODE_CAL:
@@ -284,6 +309,10 @@ _mesa_print_instruction(const struct prog_instruction *inst)
       _mesa_printf("END");
       print_comment(inst);
       break;
+   case OPCODE_NOP:
+      _mesa_printf("NOP");
+      print_comment(inst);
+      break;
    /* XXX may need other special-case instructions */
    default:
       /* typical alu instruction */