intel/fs/gen12: Fix hangs with per-sample SIMD32 fragment shader dispatch.

[mesa.git] / src / intel / compiler / brw_disasm_info.c

diff --git a/src/intel/compiler/brw_disasm_info.c b/src/intel/compiler/brw_disasm_info.c
index 3db79ede70835c7d2ec7d032159aeb1e7480651d..bec83e8a65d3bde5b85952bdab63894ccf188a5a 100644 (file)
--- a/src/intel/compiler/brw_disasm_info.c
+++ b/src/intel/compiler/brw_disasm_info.c
@@ -24,10 +24,11 @@
 #include "brw_cfg.h"
 #include "brw_eu.h"
 #include "brw_disasm_info.h"
-#include "common/gen_debug.h"
+#include "dev/gen_debug.h"
 #include "compiler/nir/nir.h"
 
-__attribute__((weak)) void nir_print_instr(const nir_instr *instr, FILE *fp) {}
+__attribute__((weak)) void nir_print_instr(UNUSED const nir_instr *instr,
+                                           UNUSED FILE *fp) {}
 
 void
 dump_assembly(void *assembly, struct disasm_info *disasm)
@@ -123,8 +124,8 @@ disasm_annotate(struct disasm_info *disasm,
    struct inst_group *group;
    if (!disasm->use_tail) {
       group = disasm_new_inst_group(disasm, offset);
-      disasm->use_tail = false;
    } else {
+      disasm->use_tail = false;
       group = exec_node_data(struct inst_group,
                              exec_list_get_tail_raw(&disasm->group_list), link);
    }