glcpp: Regenerated glcpp-lex.c from previous commit.

[mesa.git] / src / glsl / ir_print_visitor.cpp

diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
index 05ac3029922d88cd11369544cba4e3c5e5380826..83e640327233d5957f1c8ab996ad1abf7d278644 100644 (file)
--- a/src/glsl/ir_print_visitor.cpp
+++ b/src/glsl/ir_print_visitor.cpp
@@ -40,29 +40,40 @@ void
 _mesa_print_ir(exec_list *instructions,
               struct _mesa_glsl_parse_state *state)
 {
-   for (unsigned i = 0; i < state->num_user_structures; i++) {
-      const glsl_type *const s = state->user_structures[i];
+   if (state) {
+      for (unsigned i = 0; i < state->num_user_structures; i++) {
+        const glsl_type *const s = state->user_structures[i];
 
-      printf("(structure (%s) (%s@%p) (%u) (\n",
-            s->name, s->name, s, s->length);
+        printf("(structure (%s) (%s@%p) (%u) (\n",
+               s->name, s->name, (void *) s, s->length);
 
-      for (unsigned j = 0; j < s->length; j++) {
-        printf("\t((");
-        print_type(s->fields.structure[j].type);
-        printf(")(%s))\n", s->fields.structure[j].name);
-      }
+        for (unsigned j = 0; j < s->length; j++) {
+           printf("\t((");
+           print_type(s->fields.structure[j].type);
+           printf(")(%s))\n", s->fields.structure[j].name);
+        }
 
-      printf(")\n");
+        printf(")\n");
+      }
    }
 
    printf("(\n");
    foreach_iter(exec_list_iterator, iter, *instructions) {
-      ((ir_instruction *)iter.get())->print();
-      printf("\n");
+      ir_instruction *ir = (ir_instruction *)iter.get();
+      ir->print();
+      if (ir->ir_type != ir_type_function)
+        printf("\n");
    }
    printf("\n)");
 }
 
+
+void ir_print_visitor::indent(void)
+{
+   for (int i = 0; i < indentation; i++)
+      printf("  ");
+}
+
 static void
 print_type(const glsl_type *t)
 {
@@ -72,7 +83,7 @@ print_type(const glsl_type *t)
       printf(" %u)", t->length);
    } else if ((t->base_type == GLSL_TYPE_STRUCT)
              && (strncmp("gl_", t->name, 3) != 0)) {
-      printf("%s@%p", t->name, t);
+      printf("%s@%p", t->name, (void *) t);
    } else {
       printf("%s", t->name);
    }
@@ -85,51 +96,85 @@ void ir_print_visitor::visit(ir_variable *ir)
 
    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 mode[] = { "", "uniform ", "in ", "out ", "inout ",
+                               "temporary " };
    const char *const interp[] = { "", "flat", "noperspective" };
 
    printf("(%s%s%s%s) ",
          cent, inv, mode[ir->mode], interp[ir->interpolation]);
 
    print_type(ir->type);
-   printf(" %s@%p)", ir->name, ir);
+   printf(" %s@%p)", ir->name, (void *) ir);
 }
 
 
 void ir_print_visitor::visit(ir_function_signature *ir)
 {
    printf("(signature ");
+   indentation++;
+
    print_type(ir->return_type);
-   printf("\n  (parameters\n");
+   printf("\n");
+   indent();
+
+   printf("(parameters\n");
+   indentation++;
+
    foreach_iter(exec_list_iterator, iter, ir->parameters) {
       ir_variable *const inst = (ir_variable *) iter.get();
 
+      indent();
       inst->accept(this);
       printf("\n");
    }
-   printf("  )\n(");
+   indentation--;
+
+   indent();
+   printf(")\n");
+
+   indent();
+
+   printf("(\n");
+   indentation++;
 
    foreach_iter(exec_list_iterator, iter, ir->body) {
       ir_instruction *const inst = (ir_instruction *) iter.get();
 
+      indent();
       inst->accept(this);
       printf("\n");
    }
+   indentation--;
+   indent();
    printf("))\n");
+   indentation--;
 }
 
 
 void ir_print_visitor::visit(ir_function *ir)
 {
+   bool found_non_builtin_proto = false;
+
+   foreach_iter(exec_list_iterator, iter, *ir) {
+      ir_function_signature *const sig = (ir_function_signature *) iter.get();
+      if (sig->is_defined || !sig->is_built_in)
+        found_non_builtin_proto = true;
+   }
+   if (!found_non_builtin_proto)
+      return;
+
    printf("(function %s\n", ir->name);
+   indentation++;
    foreach_iter(exec_list_iterator, iter, *ir) {
       ir_function_signature *const sig = (ir_function_signature *) iter.get();
 
+      indent();
       sig->accept(this);
       printf("\n");
    }
-
-   printf(")\n");
+   indentation--;
+   indent();
+   printf(")\n\n");
 }
 
 
@@ -221,7 +266,7 @@ void ir_print_visitor::visit(ir_swizzle *ir)
 void ir_print_visitor::visit(ir_dereference_variable *ir)
 {
    ir_variable *var = ir->variable_referenced();
-   printf("(var_ref %s@%p) ", var->name, var);
+   printf("(var_ref %s@%p) ", var->name, (void *) var);
 }
 
 
@@ -251,7 +296,19 @@ void ir_print_visitor::visit(ir_assignment *ir)
    else
       printf("(constant bool (1))");
 
-   printf(" ");
+
+   char mask[5];
+   unsigned j = 0;
+
+   for (unsigned i = 0; i < 4; i++) {
+      if ((ir->write_mask & (1 << i)) != 0) {
+        mask[j] = "xyzw"[i];
+        j++;
+      }
+   }
+   mask[j] = '\0';
+
+   printf(" (%s) ", mask);
 
    ir->lhs->accept(this);
 
@@ -270,16 +327,20 @@ void ir_print_visitor::visit(ir_constant *ir)
    print_type(ir->type);
    printf(" (");
 
-   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);
+   if (ir->type->is_array()) {
+      for (unsigned i = 0; i < ir->type->length; i++)
+        ir->get_array_element(i)->accept(this);
+   } else {
+      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(")) ");
@@ -335,21 +396,33 @@ ir_print_visitor::visit(ir_if *ir)
    ir->condition->accept(this);
 
    printf("(\n");
+   indentation++;
+
    foreach_iter(exec_list_iterator, iter, ir->then_instructions) {
       ir_instruction *const inst = (ir_instruction *) iter.get();
 
+      indent();
       inst->accept(this);
       printf("\n");
    }
+
+   indentation--;
+   indent();
    printf(")\n");
 
+   indent();
    printf("(\n");
+   indentation++;
+
    foreach_iter(exec_list_iterator, iter, ir->else_instructions) {
       ir_instruction *const inst = (ir_instruction *) iter.get();
 
+      indent();
       inst->accept(this);
       printf("\n");
    }
+   indentation--;
+   indent();
    printf("))\n");
 }
 
@@ -370,12 +443,17 @@ ir_print_visitor::visit(ir_loop *ir)
    if (ir->increment != NULL)
       ir->increment->accept(this);
    printf(") (\n");
+   indentation++;
+
    foreach_iter(exec_list_iterator, iter, ir->body_instructions) {
       ir_instruction *const inst = (ir_instruction *) iter.get();
 
+      indent();
       inst->accept(this);
       printf("\n");
    }
+   indentation--;
+   indent();
    printf("))\n");
 }