preprocess and store brw_inst.iexperiment/brwinst-struct

5 files changed, 10 insertions, 8 deletions

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 5809dc65dd6..d15ce07301c 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -23,7 +23,7 @@
 
 include Makefile.sources
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/ \
 	-I$(top_srcdir)/src/mapi \
@@ -33,11 +33,16 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/gtest/include \
 	-I$(top_builddir)/src/mesa/drivers/dri/common \
 	$(DEFINES) \
-	$(VISIBILITY_CFLAGS) \
 	$(INTEL_CFLAGS)
 
+AM_CFLAGS = \
+	$(VISIBILITY_CFLAGS)
+
 AM_CXXFLAGS = $(AM_CFLAGS)
 
+%.i: %.h
+	$(CPP) $(AM_CPPFLAGS) -o $@ $<
+
 gen8_instruction_CFLAGS = $(AM_CFLAGS) -fkeep-inline-functions
 
 noinst_LTLIBRARIES = libi965_dri.la
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 25700593d36..bc33e6b4e28 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -27,6 +27,7 @@ i965_FILES = \
 	intel_tex_subimage.c \
 	intel_tex_validate.c \
 	intel_upload.c \
+	brw_inst.i \
 	brw_binding_tables.c \
 	brw_blorp.cpp \
 	brw_blorp_blit.cpp \
diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c
index f07d2a2551a..412bb58011e 100644
--- a/src/mesa/drivers/dri/i965/brw_disasm.c
+++ b/src/mesa/drivers/dri/i965/brw_disasm.c
@@ -30,7 +30,7 @@
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_reg.h"
-#include "brw_inst.h"
+#include "brw_inst.i"
 
 const struct opcode_desc opcode_descs[128] = {
     [BRW_OPCODE_MOV] = { .name = "mov", .nsrc = 1, .ndst = 1 },
diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965/brw_eu.h
index e06d832933e..dd24e7a5aae 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_eu.h
@@ -34,10 +34,10 @@
 #define BRW_EU_H
 
 #include <stdbool.h>
-#include "brw_inst.h"
 #include "brw_structs.h"
 #include "brw_defines.h"
 #include "brw_reg.h"
+#include "brw_inst.i"
 #include "intel_asm_printer.h"
 #include "program/prog_instruction.h"
 
diff --git a/src/mesa/drivers/dri/i965/brw_inst.h b/src/mesa/drivers/dri/i965/brw_inst.h
index ad679c8ae12..ded82319cfd 100644
--- a/src/mesa/drivers/dri/i965/brw_inst.h
+++ b/src/mesa/drivers/dri/i965/brw_inst.h
@@ -31,10 +31,6 @@
 #ifndef BRW_INST_H
 #define BRW_INST_H
 
-#include <stdint.h>
-
-#include "brw_context.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif