From: Rhys Perry Date: Thu, 3 Oct 2019 18:09:24 +0000 (+0100) Subject: nir/print: always use the right FILE * X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1264acdf4b75826a826b6cf1028133c491a87772;p=mesa.git nir/print: always use the right FILE * Signed-off-by: Rhys Perry Reviewed-by: Eric Anholt --- diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c index 4e144c1c955..48844b7ed79 100644 --- a/src/compiler/nir/nir_print.c +++ b/src/compiler/nir/nir_print.c @@ -62,6 +62,8 @@ typedef struct { static void print_annotation(print_state *state, void *obj) { + FILE *fp = state->fp; + if (!state->annotations) return; @@ -72,7 +74,7 @@ print_annotation(print_state *state, void *obj) const char *note = entry->data; _mesa_hash_table_remove(state->annotations, entry); - fprintf(stderr, "%s\n\n", note); + fprintf(fp, "%s\n\n", note); } static void @@ -465,7 +467,7 @@ print_var_decl(nir_variable *var, print_state *state) const char *const reorder = (access & ACCESS_CAN_REORDER) ? "reorderable " : ""; fprintf(fp, "%s%s%s%s%s%s", coher, volat, restr, ronly, wonly, reorder); -#define FORMAT_CASE(x) case x: fprintf(stderr, #x " "); break +#define FORMAT_CASE(x) case x: fprintf(fp, #x " "); break switch (var->data.image.format) { FORMAT_CASE(GL_RGBA32F); FORMAT_CASE(GL_RGBA32UI);