nir/print: always use the right FILE *
authorRhys Perry <pendingchaos02@gmail.com>
Thu, 3 Oct 2019 18:09:24 +0000 (19:09 +0100)
committerRhys Perry <pendingchaos02@gmail.com>
Fri, 4 Oct 2019 15:24:10 +0000 (15:24 +0000)
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
src/compiler/nir/nir_print.c

index 4e144c1c955578457a213789d8430944da000f2d..48844b7ed79a7c40800890761d1fcb3c4e237f5e 100644 (file)
@@ -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);