i965: Stop including brw_cfg.h in brw_disasm_info.h
authorJason Ekstrand <jason.ekstrand@intel.com>
Sat, 18 Nov 2017 01:27:55 +0000 (17:27 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 18 Nov 2017 05:51:16 +0000 (21:51 -0800)
The brw_disasm_info header is included by certain tools in order to get
shader assembly from binaries so it's a semi-external header.  Including
brw_cfg.h also pulls in brw_shader.h so you end up getting quite a bit
of our back-end compiler internals.  Instead, make the couple of forward
declarations we need and make the header more stand-alone.  This fixes
the meson build.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Fixes: 4f82b17287194ca7d10816f6cfe4712a3e0a03fc
src/intel/compiler/brw_disasm_info.h

index 638b37911d33f8519c4fe6bf3be38a108e8e8b8f..b8826e681750b93565cce3da2f4b16c17fd37207 100644 (file)
 #ifndef _INTEL_ASM_ANNOTATION_H
 #define _INTEL_ASM_ANNOTATION_H
 
-#include "brw_cfg.h"
+#include "compiler/glsl/list.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct cfg_t;
+struct backend_instruction;
+struct gen_device_info;
+
 struct inst_group {
    struct exec_node link;