Preprocess VME shader first

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit 65f644f71422f38064677f2fed6e11ac04037936)

diff --git a/src/shaders/vme/Makefile.am b/src/shaders/vme/Makefile.am
index ba08576..1026509 100644 (file)
--- a/src/shaders/vme/Makefile.am
+++ b/src/shaders/vme/Makefile.am
@@ -23,13 +23,17 @@ SUFFIXES = .g6a .g6b .g7a .g7b .gen6.asm .gen7.asm
 if HAVE_GEN4ASM
 $(INTEL_GEN6_ASM): $(VME_CORE) $(INTEL_GEN6_INC)
 .g6a.gen6.asm:
-       $(AM_V_GEN)m4 $< > $@
+       $(AM_V_GEN)cpp -P -DDEV_SNB $< > _vme0.$@       && \
+       m4 _vme0.$@ > $@                                && \
+       rm _vme0.$@
 .gen6.asm.g6b:
        $(AM_V_GEN)$(GEN4ASM) -g 6 -o $@ $<
 
 $(INTEL_GEN7_ASM): $(VME_CORE) $(INTEL_GEN7_INC)
 .g7a.gen7.asm:
-       $(AM_V_GEN)m4 $< > $@
+       $(AM_V_GEN)cpp -P -DDEV_IVB $< > _vme0.$@       && \
+       m4 _vme0.$@ > $@                                && \
+       rm _vme0.$@
 .gen7.asm.g7b:
        $(AM_V_GEN)$(GEN4ASM) -g 7 -o $@ $<
 endif

diff --git a/src/shaders/vme/batchbuffer.g6a b/src/shaders/vme/batchbuffer.g6a
index 4cfa6ef..7b29c10 100644 (file)
--- a/src/shaders/vme/batchbuffer.g6a
+++ b/src/shaders/vme/batchbuffer.g6a
@@ -24,6 +24,6 @@
  *    Xiang Haihao <haihao.xiang@intel.com>
  */
 
-include(`gen6_batchbuffer_header.inc')
-include(`batchbuffer.asm')
+#include "gen6_batchbuffer_header.inc"
+#include "batchbuffer.asm"
 

diff --git a/src/shaders/vme/batchbuffer.g7a b/src/shaders/vme/batchbuffer.g7a
index a2c8864..cdfbc7e 100644 (file)
--- a/src/shaders/vme/batchbuffer.g7a
+++ b/src/shaders/vme/batchbuffer.g7a
@@ -24,6 +24,6 @@
  *    Xiang Haihao <haihao.xiang@intel.com>
  */
 
-include(`gen7_batchbuffer_header.inc')
-include(`batchbuffer.asm')
+#include "gen7_batchbuffer_header.inc"
+#include "batchbuffer.asm"
 

diff --git a/src/shaders/vme/inter_frame.g6a b/src/shaders/vme/inter_frame.g6a
index d89588f..6c03c9e 100644 (file)
--- a/src/shaders/vme/inter_frame.g6a
+++ b/src/shaders/vme/inter_frame.g6a
@@ -1,2 +1,2 @@
-include(`gen6_vme_header.inc')
-include(`inter_frame.asm')
+#include "gen6_vme_header.inc"
+#include "inter_frame.asm"

diff --git a/src/shaders/vme/inter_frame.g7a b/src/shaders/vme/inter_frame.g7a
index cb51f52..170e35f 100644 (file)
--- a/src/shaders/vme/inter_frame.g7a
+++ b/src/shaders/vme/inter_frame.g7a
@@ -1,2 +1,2 @@
-include(`gen7_vme_header.inc')
-include(`inter_frame.asm')
+#include "gen7_vme_header.inc"
+#include "inter_frame.asm"

diff --git a/src/shaders/vme/intra_frame.g6a b/src/shaders/vme/intra_frame.g6a
index d39118c..8bf33d5 100644 (file)
--- a/src/shaders/vme/intra_frame.g6a
+++ b/src/shaders/vme/intra_frame.g6a
@@ -1,3 +1,3 @@
-include(`gen6_vme_header.inc')
-include(`intra_frame.asm')
+#include "gen6_vme_header.inc"
+#include "intra_frame.asm"
 

diff --git a/src/shaders/vme/intra_frame.g7a b/src/shaders/vme/intra_frame.g7a
index c43e739..b4f8936 100644 (file)
--- a/src/shaders/vme/intra_frame.g7a
+++ b/src/shaders/vme/intra_frame.g7a
@@ -1,2 +1,3 @@
-include(`gen7_vme_header.inc')
-include(`intra_frame.asm')
+#include "gen7_vme_header.inc"
+#include "intra_frame.asm"
+