Add unary operator to convert unsigned integer to float

[mesa.git] / ir_print_visitor.cpp

diff --git a/ir_print_visitor.cpp b/ir_print_visitor.cpp
index 365ff5933e3b561fea7492cbeab8cf7fe6105a4b..682a553249c13a074c3958ff7acdeaef6e8555ab 100644 (file)
--- a/ir_print_visitor.cpp
+++ b/ir_print_visitor.cpp
@@ -22,28 +22,51 @@
  */
 #include <cstdio>
 #include "ir_print_visitor.h"
+#include "glsl_types.h"
 
-void ir_print_visitor::visit(ir_variable *ir)
+static void
+print_type(const glsl_type *t)
 {
-   printf("(declare \n");
-
-   const char *const cent = (ir->centroid) ? "centroid " : "";
-   const char *const inv = (ir->invariant) ? "invariant " : "";
-   const char *const mode[] = { "", "uniform ", "in ", "out ", "inout " };
-   const char *const interp[] = { "", "flat", "noperspective" };
+   if (t->base_type == GLSL_TYPE_ARRAY) {
+      printf("array (");
+      print_type(t->fields.array);
+      printf(") (%u))", t->length);
+   } else if (t->base_type == GLSL_TYPE_STRUCT) {
+      printf("struct (%s %u ", t->name ? t->name : "@", t->length);
+      printf("(FINISHME: structure fields go here) ");
+      printf(")");
+   } else {
+      printf("%s", t->name);
+   }
+}
 
-   printf("    (%s%s%s%s)\n",
-         cent, inv, mode[ir->mode], interp[ir->interpolation]);
 
-   printf("    (FINISHME: type goes here)\n");
-   printf("    (%s)\n", ir->name);
-   printf(")\n");
+void ir_print_visitor::visit(ir_variable *ir)
+{
+   if (deref_depth) {
+      printf("(%s)", ir->name);
+   } else {
+      printf("(declare ");
+
+      const char *const cent = (ir->centroid) ? "centroid " : "";
+      const char *const inv = (ir->invariant) ? "invariant " : "";
+      const char *const mode[] = { "", "uniform ", "in ", "out ", "inout " };
+      const char *const interp[] = { "", "flat", "noperspective" };
+
+      printf("(%s%s%s%s) ",
+            cent, inv, mode[ir->mode], interp[ir->interpolation]);
+
+      printf("(");
+      print_type(ir->type);
+      printf(") ");
+      printf("(%s)) ", ir->name);
+   }
 }
 
 
 void ir_print_visitor::visit(ir_label *ir)
 {
-   printf("(label %s)\n", ir->label);
+   printf("\n(label %s)", ir->label);
 }
 
 
@@ -63,41 +86,134 @@ void ir_print_visitor::visit(ir_function *ir)
 
 void ir_print_visitor::visit(ir_expression *ir)
 {
-   printf("%s:%d:\n", __func__, __LINE__);
-   (void) ir;
+   printf("(expression ");
+
+   printf("(FINISHME: operator) ");
+
+   printf("(");
+   if (ir->operands[0])
+      ir->operands[0]->accept(this);
+   printf(") ");
+
+   printf("(");
+   if (ir->operands[1])
+      ir->operands[1]->accept(this);
+   printf(")) ");
+}
+
+
+void ir_print_visitor::visit(ir_swizzle *ir)
+{
+   const unsigned swiz[4] = {
+      ir->mask.x,
+      ir->mask.y,
+      ir->mask.z,
+      ir->mask.w,
+   };
+
+   printf("(swiz ");
+   for (unsigned i = 0; i < ir->mask.num_components; i++) {
+      printf("%c", "xyzw"[swiz[i]]);
+   }
+   printf(" ");
+   ir->val->accept(this);
+   printf(")");
 }
 
 
 void ir_print_visitor::visit(ir_dereference *ir)
 {
-   printf("%s:%d:\n", __func__, __LINE__);
-   (void) ir;
+   deref_depth++;
+
+   switch (ir->mode) {
+   case ir_dereference::ir_reference_variable: {
+      printf("(var_ref ");
+      ir->var->accept(this);
+      printf(") ");
+      break;
+   }
+   case ir_dereference::ir_reference_array:
+      printf("(array_ref ");
+      ir->var->accept(this);
+      ir->selector.array_index->accept(this);
+      printf(") ");
+      break;
+   case ir_dereference::ir_reference_record:
+      printf("(record_ref ");
+      ir->var->accept(this);
+      printf("(%s)) ", ir->selector.field);
+      break;
+   }
+
+   deref_depth--;
 }
 
 
 void ir_print_visitor::visit(ir_assignment *ir)
 {
-   printf("(assign\n");
+   printf("(assign (");
 
-   printf("    (");
    if (ir->condition)
       ir->condition->accept(this);
    else
       printf("true");
-   printf(")\n");
 
-   printf("    (");
+   printf(") (");
+
    ir->lhs->accept(this);
-   printf(")\n");
 
-   printf("    (");
+   printf(") (");
+
    ir->rhs->accept(this);
-   printf(")\n");
+   printf(") ");
 }
 
 
 void ir_print_visitor::visit(ir_constant *ir)
 {
-   printf("%s:%d:\n", __func__, __LINE__);
+   const glsl_type *const base_type = ir->type->get_base_type();
+
+   printf("(constant (");
+   print_type(base_type);
+   printf(") ");
+
+   printf("(%d) (", ir->type->components());
+   for (unsigned i = 0; i < ir->type->components(); i++) {
+      if (i != 0)
+        printf(", ");
+
+      switch (base_type->base_type) {
+      case GLSL_TYPE_UINT:  printf("%u", ir->value.u[i]); break;
+      case GLSL_TYPE_INT:   printf("%d", ir->value.i[i]); break;
+      case GLSL_TYPE_FLOAT: printf("%f", ir->value.f[i]); break;
+      case GLSL_TYPE_BOOL:  printf("%d", ir->value.b[i]); break;
+      default: assert(0);
+      }
+   }
+   printf(")) ");
+}
+
+
+void
+ir_print_visitor::visit(ir_call *ir)
+{
    (void) ir;
+
+   printf("(call FINISHME: function name here\n");
+   printf("    (FINISHME: function paramaters here))\n");
+}
+
+
+void
+ir_print_visitor::visit(ir_return *ir)
+{
+   printf("(return");
+
+   ir_rvalue *const value = ir->get_value();
+   if (value) {
+      printf(" ");
+      value->accept(this);
+   }
+
+   printf(")");
 }