diff --git a/src/compiler/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index 0b510519e4c..45988bb34ab 100644 --- a/src/compiler/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp @@ -45,6 +45,20 @@ ir_instruction::fprint(FILE *f) const deconsted->accept(&v); } +static void +glsl_print_type(FILE *f, const glsl_type *t) +{ + if (t->is_array()) { + fprintf(f, "(array "); + glsl_print_type(f, t->fields.array); + fprintf(f, " %u)", t->length); + } else if (t->is_struct() && !is_gl_identifier(t->name)) { + fprintf(f, "%s@%p", t->name, (void *) t); + } else { + fprintf(f, "%s", t->name); + } +} + extern "C" { void _mesa_print_ir(FILE *f, exec_list *instructions, diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 9e15305ede4..cb5ebad7e75 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -3382,24 +3382,4 @@ glsl_get_sampler_dim_coordinate_components(enum glsl_sampler_dim dim) } } -static inline bool -is_gl_identifier(const char *s) -{ - return s && s[0] == 'g' && s[1] == 'l' && s[2] == '_'; -} - -void -glsl_print_type(FILE *f, const glsl_type *t) -{ - if (t->is_array()) { - fprintf(f, "(array "); - glsl_print_type(f, t->fields.array); - fprintf(f, " %u)", t->length); - } else if (t->is_struct() && !is_gl_identifier(t->name)) { - fprintf(f, "%s@%p", t->name, (void *) t); - } else { - fprintf(f, "%s", t->name); - } -} - } diff --git a/src/compiler/glsl_types.h b/src/compiler/glsl_types.h index d5c0721f0c7..51e233c8a88 100644 --- a/src/compiler/glsl_types.h +++ b/src/compiler/glsl_types.h @@ -54,9 +54,6 @@ glsl_type_singleton_decref(); extern void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state); -void -glsl_print_type(FILE *f, const struct glsl_type *t); - void encode_type_to_blob(struct blob *blob, const struct glsl_type *type); const struct glsl_type *decode_type_from_blob(struct blob_reader *blob);