OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: make print_type non-static for debugging

Browse Source 
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5746>
This commit is contained in:
Marek Olšák
2020-07-04 19:12:13 -04:00
parent 1d5e1882f6
commit a038863ba0
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/glsl/ir.h
View File

@@ -2535,6 +2535,9 @@ extern "C" {
extern void _mesa_print_ir(FILE *f, struct exec_list *instructions, extern void _mesa_print_ir(FILE *f, struct exec_list *instructions,
struct _mesa_glsl_parse_state *state); struct _mesa_glsl_parse_state *state);
extern void
ir_print_type(FILE *f, const struct glsl_type *t);
extern void extern void
fprint_ir(FILE *f, const void *instruction); fprint_ir(FILE *f, const void *instruction);

20
src/compiler/glsl/ir_print_visitor.cpp
View File

@@ -30,8 +30,6 @@
#include "util/u_string.h" #include "util/u_string.h"
#include "util/half_float.h" #include "util/half_float.h"
static void print_type(FILE *f, const glsl_type *t);
void void
ir_instruction::print(void) const ir_instruction::print(void) const
{ {
@@ -61,7 +59,7 @@ _mesa_print_ir(FILE *f, exec_list *instructions,
for (unsigned j = 0; j < s->length; j++) { for (unsigned j = 0; j < s->length; j++) {
fprintf(f, "\t(("); fprintf(f, "\t((");
print_type(f, s->fields.structure[j].type); ir_print_type(f, s->fields.structure[j].type);
fprintf(f, ")(%s))\n", s->fields.structure[j].name); fprintf(f, ")(%s))\n", s->fields.structure[j].name);
} }
@@ -143,12 +141,12 @@ ir_print_visitor::unique_name(ir_variable *var)
return name; return name;
} }
static void extern "C" void
print_type(FILE *f, const glsl_type *t) ir_print_type(FILE *f, const glsl_type *t)
{ {
if (t->is_array()) { if (t->is_array()) {
fprintf(f, "(array "); fprintf(f, "(array ");
print_type(f, t->fields.array); ir_print_type(f, t->fields.array);
fprintf(f, " %u)", t->length); fprintf(f, " %u)", t->length);
} else if (t->is_struct() && !is_gl_identifier(t->name)) { } else if (t->is_struct() && !is_gl_identifier(t->name)) {
fprintf(f, "%s@%p", t->name, (void *) t); fprintf(f, "%s@%p", t->name, (void *) t);
@@ -225,7 +223,7 @@ void ir_print_visitor::visit(ir_variable *ir)
stream, stream,
interp[ir->data.interpolation]); interp[ir->data.interpolation]);
print_type(f, ir->type); ir_print_type(f, ir->type);
fprintf(f, " %s)", unique_name(ir)); fprintf(f, " %s)", unique_name(ir));
} }
@@ -236,7 +234,7 @@ void ir_print_visitor::visit(ir_function_signature *ir)
fprintf(f, "(signature "); fprintf(f, "(signature ");
indentation++; indentation++;
print_type(f, ir->return_type); ir_print_type(f, ir->return_type);
fprintf(f, "\n"); fprintf(f, "\n");
indent(); indent();
@@ -290,7 +288,7 @@ void ir_print_visitor::visit(ir_expression *ir)
{ {
fprintf(f, "(expression "); fprintf(f, "(expression ");
print_type(f, ir->type); ir_print_type(f, ir->type);
fprintf(f, " %s ", ir_expression_operation_strings[ir->operation]); fprintf(f, " %s ", ir_expression_operation_strings[ir->operation]);
@@ -314,7 +312,7 @@ void ir_print_visitor::visit(ir_texture *ir)
return; return;
} }
print_type(f, ir->type); ir_print_type(f, ir->type);
fprintf(f, " "); fprintf(f, " ");
ir->sampler->accept(this); ir->sampler->accept(this);
@@ -478,7 +476,7 @@ print_float_constant(FILE *f, float val)
void ir_print_visitor::visit(ir_constant *ir) void ir_print_visitor::visit(ir_constant *ir)
{ {
fprintf(f, "(constant "); fprintf(f, "(constant ");
print_type(f, ir->type); ir_print_type(f, ir->type);
fprintf(f, " ("); fprintf(f, " (");
if (ir->type->is_array()) { if (ir->type->is_array()) {