_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)
{
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);
}
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)
{
+ if (!ir->has_user_signature())
+ 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();
+ if (sig->is_builtin)
+ continue;
+
+ indent();
sig->accept(this);
printf("\n");
}
-
- printf(")\n");
+ indentation--;
+ indent();
+ printf(")\n\n");
}
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);
}
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);
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(")) ");
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");
- printf("(\n");
- foreach_iter(exec_list_iterator, iter, ir->else_instructions) {
- ir_instruction *const inst = (ir_instruction *) iter.get();
+ indent();
+ if (!ir->else_instructions.is_empty()) {
+ printf("(\n");
+ indentation++;
- inst->accept(this);
- printf("\n");
+ 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");
+ } else {
+ printf("())\n");
}
- printf("))\n");
}
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");
}